Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix for a case of 'static initialization fiasco' with OSL closure variables. The parameter lists are using OIIO::TypeDesc static standards, which are also static variables. With static OSL libraries these are not initialized when the closure parameter lists are initialized, so OSL rejects the closure types.

Browse Source 
Putting static initialization into functions works just as well, but ensures the OIIO::TypeDesc access is delayed until initialization is complete.
This commit is contained in:
Lukas Toenne
2012-10-06 16:28:02 +00:00
parent 2ecb4781a7
commit 78978dcd80
17 changed files with 258 additions and 167 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
intern/cycles/kernel/osl/emissive.cpp
View File

@@ -97,10 +97,14 @@ public:
ClosureParam closure_emission_params[] = {
CLOSURE_STRING_KEYPARAM("label"),
CLOSURE_FINISH_PARAM(GenericEmissiveClosure)
};
ClosureParam *closure_emission_params()
{
static ClosureParam params[] = {
CLOSURE_STRING_KEYPARAM("label"),
CLOSURE_FINISH_PARAM(GenericEmissiveClosure)
};
return params;
}
CLOSURE_PREPARE(closure_emission_prepare, GenericEmissiveClosure)