Merged changes in the trunk up to revision 36551.
[blender.git] / source / blender / blenkernel / intern / object.c
index 2721d02eab612b0f6e3fc33116a2f78b6628d429..15c4028478cab83b7ce748c4deeeb6a09018cf9f 100644 (file)
@@ -1613,6 +1613,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) {
@@ -2559,10 +2563,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