[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [48684] branches/soc-2012-swiss_cheese/ source/blender/blenkernel/intern: workaround for infinite recursion problem

[Jason Wilkins]

Revision: 48684
          
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=48684
Author:   jwilkins
Date:     2012-07-06 14:47:25 +0000 (Fri, 06 Jul 2012)
Log Message:
-----------
workaround for infinite recursion problem

Modified Paths:
--------------
    branches/soc-2012-swiss_cheese/source/blender/blenkernel/intern/depsgraph.c
    branches/soc-2012-swiss_cheese/source/blender/blenkernel/intern/object.c

Modified: 
branches/soc-2012-swiss_cheese/source/blender/blenkernel/intern/depsgraph.c
===================================================================
--- branches/soc-2012-swiss_cheese/source/blender/blenkernel/intern/depsgraph.c 
2012-07-06 14:26:22 UTC (rev 48683)
+++ branches/soc-2012-swiss_cheese/source/blender/blenkernel/intern/depsgraph.c 
2012-07-06 14:47:25 UTC (rev 48684)
@@ -620,18 +620,18 @@
        }
        
        /* material drivers */
-       if (ob->totcol) {
-               int a;
-               
-               for (a = 1; a <= ob->totcol; a++) {
-                       Material *ma = give_current_material(ob, a);
-                       
-                       if (ma) {
-                               /* recursively figure out if there are drivers, 
and hook these up to this object */
-                               dag_add_material_driver_relations(dag, node, 
ma);
-                       }
-               }
-       }
+       //if (ob->totcol) {
+       //      int a;
+       //      
+       //      for (a = 1; a <= ob->totcol; a++) {
+       //              Material *ma = give_current_material(ob, a);
+       //              
+       //              if (ma) {
+       //                      /* recursively figure out if there are drivers, 
and hook these up to this object */
+       //                      dag_add_material_driver_relations(dag, node, 
ma);
+       //              }
+       //      }
+       //}
        
        /* particles */
        psys = ob->particlesystem.first;

Modified: 
branches/soc-2012-swiss_cheese/source/blender/blenkernel/intern/object.c
===================================================================
--- branches/soc-2012-swiss_cheese/source/blender/blenkernel/intern/object.c    
2012-07-06 14:26:22 UTC (rev 48683)
+++ branches/soc-2012-swiss_cheese/source/blender/blenkernel/intern/object.c    
2012-07-06 14:47:25 UTC (rev 48684)
@@ -2601,18 +2601,18 @@
                         * However, not doing anything (or trying to hack 
around this lack) is not an option 
                         * anymore, especially due to Cycles [#31834] 
                         */
-                       if (ob->totcol) {
-                               int a;
-                               
-                               for (a = 1; a <= ob->totcol; a++) {
-                                       Material *ma = 
give_current_material(ob, a);
-                                       
-                                       if (ma) {
-                                               /* recursively update drivers 
for this material */
-                                               material_drivers_update(scene, 
ma, ctime);
-                                       }
-                               }
-                       }
+                       //if (ob->totcol) {
+                       //      int a;
+                       //      
+                       //      for (a = 1; a <= ob->totcol; a++) {
+                       //              Material *ma = 
give_current_material(ob, a);
+                       //              
+                       //              if (ma) {
+                       //                      /* recursively update drivers 
for this material */
+                       //                      material_drivers_update(scene, 
ma, ctime);
+                       //              }
+                       //      }
+                       //}
                        
                        /* particles */
                        if (ob->particlesystem.first) {

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs