diff options
| author | Mitchell Stokes <mogurijin@gmail.com> | 2011-05-07 06:33:57 +0400 |
|---|---|---|
| committer | Mitchell Stokes <mogurijin@gmail.com> | 2011-05-07 06:33:57 +0400 |
| commit | 46a9a9a1c144f56a00d58980b927327ad8ce85dd (patch) | |
| tree | b8d93e9941e13cfc6b0b0273dc6d54532a3f22e6 /source/blender/blenkernel/intern/object.c | |
| parent | ba94834c2bb95368986d43c64cbbee8961c980d7 (diff) | |
| parent | 770119d16f7dbee99a60d19540818892c970c4e2 (diff) | |
Merging r36382 through r36528
Diffstat (limited to 'source/blender/blenkernel/intern/object.c')
| -rw-r--r-- | source/blender/blenkernel/intern/object.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/source/blender/blenkernel/intern/object.c b/source/blender/blenkernel/intern/object.c index 64201abbc13..79a4e6443d2 100644 --- a/source/blender/blenkernel/intern/object.c +++ b/source/blender/blenkernel/intern/object.c @@ -1606,6 +1606,10 @@ void object_make_proxy(Object *ob, Object *target, Object *gob) armature_set_id_extern(ob); } + else if (target->type == OB_EMPTY) { + ob->empty_drawtype = target->empty_drawtype; + ob->empty_drawsize = target->empty_drawsize; + } /* copy IDProperties */ if(ob->id.properties) { @@ -2552,10 +2556,7 @@ void object_handle_update(Scene *scene, Object *ob) invert_m4_m4(obg->imat, obg->obmat); mul_m4_m4m4(ob->obmat, ob->proxy_from->obmat, obg->imat); if(obg->dup_group) { /* should always be true */ - float tvec[3]; - copy_v3_v3(tvec, obg->dup_group->dupli_ofs); - mul_mat3_m4_v3(ob->obmat, tvec); - sub_v3_v3(ob->obmat[3], tvec); + add_v3_v3(ob->obmat[3], obg->dup_group->dupli_ofs); } } else |