diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-09-27 16:24:38 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-09-27 16:24:38 +0400 |
| commit | d4e40b52309b69b2a4379db6df5a6ace9fad65e8 (patch) | |
| tree | 1889b2be812b1946e0ddd8529d70dd647b276331 /source/blender/editors/space_outliner | |
| parent | f3850ca13b2b8a970abaab05aab2b4e217420231 (diff) | |
fix [#32616] Changing parent does not keep transformation
add an option to apply the transform of an object when re-parenting.
the reason for this is you dont always want to apply transform because...
- your object may be driven/animated and the transformation will be lost.
- with negative scales and rotation it can end up giving odd/not-useful results.
Diffstat (limited to 'source/blender/editors/space_outliner')
| -rw-r--r-- | source/blender/editors/space_outliner/outliner_edit.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/editors/space_outliner/outliner_edit.c b/source/blender/editors/space_outliner/outliner_edit.c index d7e180f982b..2ec23091019 100644 --- a/source/blender/editors/space_outliner/outliner_edit.c +++ b/source/blender/editors/space_outliner/outliner_edit.c @@ -1423,7 +1423,7 @@ static int parent_drop_exec(bContext *C, wmOperator *op) RNA_string_get(op->ptr, "child", childname); ob = (Object *)BKE_libblock_find_name(ID_OB, childname); - ED_object_parent_set(op->reports, bmain, scene, ob, par, partype, FALSE); + ED_object_parent_set(op->reports, bmain, scene, ob, par, partype, FALSE, FALSE); DAG_scene_sort(bmain, scene); DAG_ids_flush_update(bmain, 0); @@ -1514,7 +1514,7 @@ static int parent_drop_invoke(bContext *C, wmOperator *op, wmEvent *event) } if ((par->type != OB_ARMATURE) && (par->type != OB_CURVE) && (par->type != OB_LATTICE)) { - if (ED_object_parent_set(op->reports, bmain, scene, ob, par, partype, FALSE)) { + if (ED_object_parent_set(op->reports, bmain, scene, ob, par, partype, FALSE, FALSE)) { DAG_scene_sort(bmain, scene); DAG_ids_flush_update(bmain, 0); WM_event_add_notifier(C, NC_OBJECT | ND_TRANSFORM, NULL); |