diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-05-03 09:41:16 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-05-03 09:41:16 +0400 |
| commit | e601dee16805cc8f83680e82d2935d65765be8bf (patch) | |
| tree | 96475cdf0a74df7f9e7b27bb9143975e9b3ea875 /source | |
| parent | 2865e072c9aa93cd51da9c52a8dab35fab48c160 (diff) | |
take 3, fix [#26727] Make Proxy ignores group offset
Diffstat (limited to 'source')
| -rw-r--r-- | source/blender/blenkernel/intern/object.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/source/blender/blenkernel/intern/object.c b/source/blender/blenkernel/intern/object.c index a6fbb4164ac..cbe0a959f15 100644 --- a/source/blender/blenkernel/intern/object.c +++ b/source/blender/blenkernel/intern/object.c @@ -2553,10 +2553,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 |