Revision: 42290
          
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=42290
Author:   campbellbarton
Date:     2011-11-30 08:03:20 +0000 (Wed, 30 Nov 2011)
Log Message:
-----------
fix for parenting bug introduced by own commit r42273, adding dummy object 
didnt initialize delta vectors.
also remove redundant NULL initializers, where the value is initialized 
immediately after.

Revision Links:
--------------
    
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=42273

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/anim.c
    trunk/blender/source/blender/blenkernel/intern/object.c
    trunk/blender/source/blender/editors/object/object_constraint.c

Modified: trunk/blender/source/blender/blenkernel/intern/anim.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/anim.c       2011-11-30 
07:39:54 UTC (rev 42289)
+++ trunk/blender/source/blender/blenkernel/intern/anim.c       2011-11-30 
08:03:20 UTC (rev 42290)
@@ -757,7 +757,7 @@
 static void frames_duplilist(ListBase *lb, Scene *scene, Object *ob, int 
level, int animated)
 {
        extern int enable_cu_speed;     /* object.c */
-       Object copyob = {{NULL}};
+       Object copyob;
        int cfrao = scene->r.cfra;
        int dupend = ob->dupend;
        

Modified: trunk/blender/source/blender/blenkernel/intern/object.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/object.c     2011-11-30 
07:39:54 UTC (rev 42289)
+++ trunk/blender/source/blender/blenkernel/intern/object.c     2011-11-30 
08:03:20 UTC (rev 42290)
@@ -120,6 +120,7 @@
        memset(workob, 0, sizeof(Object));
        
        workob->size[0]= workob->size[1]= workob->size[2]= 1.0f;
+       workob->dsize[0]= workob->dsize[1]= workob->dsize[2]= 1.0f;
        workob->rotmode= ROT_MODE_EUL;
 }
 

Modified: trunk/blender/source/blender/editors/object/object_constraint.c
===================================================================
--- trunk/blender/source/blender/editors/object/object_constraint.c     
2011-11-30 07:39:54 UTC (rev 42289)
+++ trunk/blender/source/blender/editors/object/object_constraint.c     
2011-11-30 08:03:20 UTC (rev 42290)
@@ -766,7 +766,7 @@
                where_is_pose(scene, ob);
        }
        else if (ob) {
-               Object workob = {{NULL}};
+               Object workob;
                
                /* use what_does_parent to find inverse - just like for normal 
parenting */
                what_does_parent(scene, ob, &workob);

_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs

Reply via email to