fix for parenting bug introduced by own commit r42273, adding dummy object didnt...
authorCampbell Barton <ideasman42@gmail.com>
Wed, 30 Nov 2011 08:03:20 +0000 (08:03 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Wed, 30 Nov 2011 08:03:20 +0000 (08:03 +0000)
also remove redundant NULL initializers, where the value is initialized immediately after.

source/blender/blenkernel/intern/anim.c
source/blender/blenkernel/intern/object.c
source/blender/editors/object/object_constraint.c

index f9b41c36791e136ed805294f701db95d4ddad8c0..0cd8845c53b44ff0265b72a7160f6e1687dfbe9e 100644 (file)
@@ -757,7 +757,7 @@ static void group_duplilist(ListBase *lb, Scene *scene, Object *ob, int level, i
 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;
        
index 7ebb63c4e1690cdfa81404ed8cd0f3cb801ac556..f2df16c8100f5ee0aaf0f2bd71733e2534932954 100644 (file)
@@ -120,6 +120,7 @@ void clear_workob(Object *workob)
        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;
 }
 
index 40d52e0b2618e32a7777534186121c566a5d976a..2a45a7df735bf7af3c3e6bf967ecf3f38f642531 100644 (file)
@@ -766,7 +766,7 @@ static int childof_set_inverse_exec (bContext *C, wmOperator *op)
                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);