Cycles: more code refactoring to rename things internally as well. Also change

property name back so we keep compatibility.
2013-08-23 14:34:34 +00:00
parent 22f4874877
commit 01e22d1b9f
17 changed files with 71 additions and 62 deletions
--- a/intern/cycles/kernel/kernel_shader.h
+++ b/intern/cycles/kernel/kernel_shader.h
@@ -959,7 +959,7 @@ __device bool shader_transparent_shadow(KernelGlobals *kg, Intersection *isect)

 /* Merging */

-#ifdef __NON_PROGRESSIVE__
+#ifdef __BRANCHED_PATH__
 __device void shader_merge_closures(KernelGlobals *kg, ShaderData *sd)
 {
 	/* merge identical closures, better when we sample a single closure at a time */