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

Cycles / OSL:

Browse Source 
* Fixes for changes in the OSL register_closure() API.
This commit is contained in:
Thomas Dinges
2012-06-04 20:50:59 +00:00
parent 5189356d58
commit 0d3b19e734
1 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
intern/cycles/kernel/osl/osl_closures.cpp
View File

@@ -48,7 +48,7 @@ static void generic_closure_setup(OSL::RendererServices *, int id, void *data)
prim->setup();
}
static bool generic_closure_mergeable(int id, const void *dataA, const void *dataB)
static bool generic_closure_compare(int id, const void *dataA, const void *dataB)
{
assert(dataA && dataB);
@@ -59,11 +59,7 @@ static bool generic_closure_mergeable(int id, const void *dataA, const void *dat
static void register_closure(OSL::ShadingSystem *ss, const char *name, int id, OSL::ClosureParam *params, OSL::PrepareClosureFunc prepare)
{
int j;
for(j = 0; params[j].type != TypeDesc(); ++j) {}
int size = params[j].offset;
ss->register_closure(name, id, params, size, prepare, generic_closure_setup, generic_closure_mergeable);
ss->register_closure(name, id, params, prepare, generic_closure_setup, generic_closure_compare);
}
void OSLShader::register_closures(OSL::ShadingSystem *ss)