[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [47436] trunk/blender/intern/cycles/kernel /osl/osl_closures.cpp: Cycles / OSL:

[Thomas Dinges]

Revision: 47436
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=47436
Author:   dingto
Date:     2012-06-04 20:50:59 +0000 (Mon, 04 Jun 2012)
Log Message:
-----------
Cycles / OSL:
* Fixes for changes in the OSL register_closure() API. 

Modified Paths:
--------------
    trunk/blender/intern/cycles/kernel/osl/osl_closures.cpp

Modified: trunk/blender/intern/cycles/kernel/osl/osl_closures.cpp
===================================================================
--- trunk/blender/intern/cycles/kernel/osl/osl_closures.cpp	2012-06-04 20:11:09 UTC (rev 47435)
+++ trunk/blender/intern/cycles/kernel/osl/osl_closures.cpp	2012-06-04 20:50:59 UTC (rev 47436)
@@ -48,7 +48,7 @@
 	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 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)