[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [16457] trunk/blender/source/blender/ blenkernel/intern/depsgraph.c: Bugfix [#12033] Cloth and Softbody don' t work with Object Actions (fix pointed out by Aligorith.

[Daniel Genrich]

Revision: 16457
          
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=16457
Author:   genscher
Date:     2008-09-10 13:40:30 +0200 (Wed, 10 Sep 2008)

Log Message:
-----------
Bugfix [#12033] Cloth and Softbody don't work with Object Actions (fix pointed 
out by Aligorith. Ton: You might like to look over this)

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/depsgraph.c

Modified: trunk/blender/source/blender/blenkernel/intern/depsgraph.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/depsgraph.c  2008-09-10 
11:38:19 UTC (rev 16456)
+++ trunk/blender/source/blender/blenkernel/intern/depsgraph.c  2008-09-10 
11:40:30 UTC (rev 16457)
@@ -1924,8 +1924,10 @@
                        }
                }
        }
-       else if(ob->scriptlink.totscript) ob->recalc |= OB_RECALC_OB;
-       else if(ob->parent) {
+       
+       if(ob->scriptlink.totscript) ob->recalc |= OB_RECALC_OB;
+       
+       if(ob->parent) {
                /* motion path or bone child */
                if(ob->parent->type==OB_CURVE || ob->parent->type==OB_ARMATURE) 
ob->recalc |= OB_RECALC_OB;
        }
@@ -1946,10 +1948,11 @@
                        }
                }
        }
-       else if(modifiers_isSoftbodyEnabled(ob)) ob->recalc |= OB_RECALC_DATA;
-       else if(object_modifiers_use_time(ob)) ob->recalc |= OB_RECALC_DATA;
-       else if((ob->pose) && (ob->pose->flag & POSE_CONSTRAINTS_TIMEDEPEND)) 
ob->recalc |= OB_RECALC_DATA;
-       else {
+       
+       if(object_modifiers_use_time(ob)) ob->recalc |= OB_RECALC_DATA;
+       if((ob->pose) && (ob->pose->flag & POSE_CONSTRAINTS_TIMEDEPEND)) 
ob->recalc |= OB_RECALC_DATA;
+       
+       {
                Mesh *me;
                Curve *cu;
                Lattice *lt;


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