[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [36456] trunk/blender/source/blender/ blenkernel/intern/object.c: take 3, fix [#26727] Make Proxy ignores group offset

[Campbell Barton]

Revision: 36456
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=36456
Author:   campbellbarton
Date:     2011-05-03 05:41:16 +0000 (Tue, 03 May 2011)
Log Message:
-----------
take 3, fix [#26727] Make Proxy ignores group offset

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

Modified: trunk/blender/source/blender/blenkernel/intern/object.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/object.c	2011-05-03 04:18:23 UTC (rev 36455)
+++ trunk/blender/source/blender/blenkernel/intern/object.c	2011-05-03 05:41:16 UTC (rev 36456)
@@ -2553,10 +2553,7 @@
 					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