[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [51148] trunk/blender/intern/cycles/render /svm.cpp: Revert fix for #31806, needs a better solution, can hang compiling some shaders.

Brecht Van Lommel brechtvanlommel at pandora.be
Sun Oct 7 16:15:50 CEST 2012


Revision: 51148
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=51148
Author:   blendix
Date:     2012-10-07 14:15:50 +0000 (Sun, 07 Oct 2012)
Log Message:
-----------
Revert fix for #31806, needs a better solution, can hang compiling some shaders.

Modified Paths:
--------------
    trunk/blender/intern/cycles/render/svm.cpp

Modified: trunk/blender/intern/cycles/render/svm.cpp
===================================================================
--- trunk/blender/intern/cycles/render/svm.cpp	2012-10-07 14:00:18 UTC (rev 51147)
+++ trunk/blender/intern/cycles/render/svm.cpp	2012-10-07 14:15:50 UTC (rev 51148)
@@ -274,17 +274,6 @@
 
 				foreach(ShaderInput *in, output->links)
 					in->stack_offset = SVM_STACK_INVALID;
-
-				/* unmark any nodes that have no more valid outputs, see [#31806] */
-				if(done.find(output->parent) != done.end()) {
-					all_done = true;
-					foreach(ShaderOutput *pout, output->parent->outputs)
-						if(pout->stack_offset != SVM_STACK_INVALID)
-							all_done = false;
-
-					if(all_done)
-						done.erase(output->parent);
-				}
 			}
 		}
 	}




More information about the Bf-blender-cvs mailing list