From e2c07778281e4ba263f87bc7cf5a19fd2e904881 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Wed, 22 Sep 2010 16:47:46 +0000 Subject: [PATCH] bugfix [#23577] Parenting scaled objects transforms them commented so this line isn't added back. --- source/blender/editors/object/object_relations.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/source/blender/editors/object/object_relations.c b/source/blender/editors/object/object_relations.c index 3711bc34fdf..baa6ef4bbd2 100644 --- a/source/blender/editors/object/object_relations.c +++ b/source/blender/editors/object/object_relations.c @@ -572,8 +572,8 @@ static int parent_set_exec(bContext *C, wmOperator *op) Object workob; /* apply transformation of previous parenting */ - object_apply_mat4(ob, ob->obmat); - + /* object_apply_mat4(ob, ob->obmat); */ /* removed because of bug [#23577] */ + /* set the parent (except for follow-path constraint option) */ if(partype != PAR_PATH_CONST) ob->parent= par;