kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

fix for parenting bug introduced by own commit r42273, adding dummy object didnt initialize delta vectors.

Browse Source 
also remove redundant NULL initializers, where the value is initialized immediately after.
This commit is contained in:
Campbell Barton 2011-11-30 08:03:20 +00:00
parent 064d46eef0
commit c9edbab08a
3 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/blenkernel/intern/anim.c
View 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) static void frames_duplilist(ListBase *lb, Scene *scene, Object *ob, int level, int animated)
{ {
extern int enable_cu_speed; /* object.c */ extern int enable_cu_speed; /* object.c */
Object copyob = {{NULL}}; Object copyob;
int cfrao = scene->r.cfra; int cfrao = scene->r.cfra;
int dupend = ob->dupend; int dupend = ob->dupend;

1
source/blender/blenkernel/intern/object.c
View File

@ -120,6 +120,7 @@ void clear_workob(Object *workob)
memset(workob, 0, sizeof(Object)); memset(workob, 0, sizeof(Object));
workob->size[0]= workob->size[1]= workob->size[2]= 1.0f; 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; workob->rotmode= ROT_MODE_EUL;
} }

2
source/blender/editors/object/object_constraint.c
View File

@ -766,7 +766,7 @@ static int childof_set_inverse_exec (bContext *C, wmOperator *op)
where_is_pose(scene, ob); where_is_pose(scene, ob);
} }
else if (ob) { else if (ob) {
Object workob = {{NULL}}; Object workob;
/* use what_does_parent to find inverse - just like for normal parenting */ /* use what_does_parent to find inverse - just like for normal parenting */
what_does_parent(scene, ob, &workob); what_does_parent(scene, ob, &workob);