[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [48321] branches/soc-2012-fried_chicken/ intern/cycles/kernel/svm/svm.h: Committed out conflicting part from previous merge.

[Miika Hamalainen]

Revision: 48321
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=48321
Author:   miikah
Date:     2012-06-26 19:36:00 +0000 (Tue, 26 Jun 2012)
Log Message:
-----------
Committed out conflicting part from previous merge. It was no longer possible to compile with Cycles.
Philipp Volguine can you check that out?

Modified Paths:
--------------
    branches/soc-2012-fried_chicken/intern/cycles/kernel/svm/svm.h

Modified: branches/soc-2012-fried_chicken/intern/cycles/kernel/svm/svm.h
===================================================================
--- branches/soc-2012-fried_chicken/intern/cycles/kernel/svm/svm.h	2012-06-26 19:15:47 UTC (rev 48320)
+++ branches/soc-2012-fried_chicken/intern/cycles/kernel/svm/svm.h	2012-06-26 19:36:00 UTC (rev 48321)
@@ -186,9 +186,9 @@
 			case NODE_CLOSURE_BSDF:
 				svm_node_closure_bsdf(kg, sd, stack, node, randb, path_flag);
 				break;
-            case CLOSURE_MYBSDF_ID:
+            /* case CLOSURE_MYBSDF_ID:
                 svm_node_closure_bsdf(kg, sd, stack, node, randb, path_flag);
-                break;
+                break;*/
 			case NODE_CLOSURE_EMISSION:
 				svm_node_closure_emission(sd, stack, node);
 				break;