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

[Dalai Felinto]

That fix broke the original report (and breaks old files - so people using
group instance + offset + proxy  watch out for your files ;). more details
in the tracker.

2011/4/28 Campbell Barton <ideasman42 at gmail.com>

> Revision: 36375
>
> http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=36375
> Author:   campbellbarton
> Date:     2011-04-28 17:19:32 +0000 (Thu, 28 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-28
> 13:47:27 UTC (rev 36374)
> +++ trunk/blender/source/blender/blenkernel/intern/object.c     2011-04-28
> 17:19:32 UTC (rev 36375)
> @@ -1550,7 +1550,10 @@
>                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);
> +                       float tvec[3];
> +                       copy_v3_v3(tvec, gob->dup_group->dupli_ofs);
> +                       mul_mat3_m4_v3(ob->obmat, tvec);
> +                       sub_v3_v3(ob->obmat[3], tvec);
>                }
>                object_apply_mat4(ob, ob->obmat, FALSE, TRUE);
>        }
> @@ -2546,7 +2549,10 @@
>                                        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);
> +                                               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);
>                                        }
>                                }
>                                else
>
> _______________________________________________
> Bf-blender-cvs mailing list
> Bf-blender-cvs at blender.org
> http://lists.blender.org/mailman/listinfo/bf-blender-cvs
>