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

[Campbell Barton]

Revision: 35952
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=35952
Author:   campbellbarton
Date:     2011-04-02 01:36:40 +0000 (Sat, 02 Apr 2011)
Log Message:
-----------
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-04-01 23:08:19 UTC (rev 35951)
+++ trunk/blender/source/blender/blenkernel/intern/object.c	2011-04-02 01:36:40 UTC (rev 35952)
@@ -1563,6 +1563,9 @@
 	if(gob) {
 		ob->rotmode= target->rotmode;
 		mul_m4_m4m4(ob->obmat, target->obmat, gob->obmat);
+		if(gob->dup_group) { /* should always be true */
+			sub_v3_v3(ob->obmat[3], gob->dup_group->dupli_ofs);
+		}
 		object_apply_mat4(ob, ob->obmat, FALSE, TRUE);
 	}
 	else {
@@ -2556,6 +2559,9 @@
 					Object *obg= ob->proxy_from->proxy_group;
 					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 */
+						add_v3_v3(ob->obmat[3], obg->dup_group->dupli_ofs);
+					}
 				}
 				else
 					copy_m4_m4(ob->obmat, ob->proxy_from->obmat);