mirrors/blender
1
0
Fork 0
mirror of https://projects.blender.org/blender/blender.git synced 2025-01-22 07:22:12 -05:00
Code Issues Projects Releases Packages Wiki Activity

Fix: Cycles CPU render wrong with latest OSL 1.14

Browse source
This commit is contained in:
Brecht Van Lommel 2025-01-22 10:49:39 +01:00
parent 446b2a983d
commit e98b45beb1
1 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
intern/cycles/kernel/osl/types.h
View file

@ -17,7 +17,11 @@ CCL_NAMESPACE_BEGIN
/* Strings are represented by their hashes on the GPU. */ /* Strings are represented by their hashes on the GPU. */
using DeviceString = size_t; using DeviceString = size_t;
#elif defined(OPENIMAGEIO_USTRING_H) #elif defined(OPENIMAGEIO_USTRING_H)
# if OSL_LIBRARY_VERSION_CODE >= 11400
using DeviceString = ustringhash;
# else
using DeviceString = ustring; using DeviceString = ustring;
# endif
#else #else
using DeviceString = const char *; using DeviceString = const char *;
#endif #endif