[Bf-blender-cvs] [af18fb8] master: Cycles: Code cleanup, remove dead code

Sergey Sharybin noreply at git.blender.org
Fri Nov 28 12:17:20 CET 2014


Commit: af18fb8036f913078e1215961f6a953a3d808d06
Author: Sergey Sharybin
Date:   Thu Nov 27 20:48:51 2014 +0500
Branches: master
https://developer.blender.org/rBaf18fb8036f913078e1215961f6a953a3d808d06

Cycles: Code cleanup, remove dead code

===================================================================

M	intern/cycles/kernel/osl/osl_closures.cpp

===================================================================

diff --git a/intern/cycles/kernel/osl/osl_closures.cpp b/intern/cycles/kernel/osl/osl_closures.cpp
index cc9942b..bae9cb2 100644
--- a/intern/cycles/kernel/osl/osl_closures.cpp
+++ b/intern/cycles/kernel/osl/osl_closures.cpp
@@ -189,11 +189,7 @@ static void register_closure(OSL::ShadingSystem *ss, const char *name, int id, O
 	/* optimization: it's possible to not use a prepare function at all and
 	 * only initialize the actual class when accessing the closure component
 	 * data, but then we need to map the id to the class somehow */
-#ifdef CLOSURE_PREPARE
-	ss->register_closure(name, id, params, prepare, NULL, NULL);
-#else
 	ss->register_closure(name, id, params, prepare, NULL);
-#endif
 }
 
 void OSLShader::register_closures(OSLShadingSystem *ss_)




More information about the Bf-blender-cvs mailing list