diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2007-12-28 20:10:55 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2007-12-28 20:10:55 +0300 |
| commit | 1c02a5f6201ed23545a2fb7157018834502144a0 (patch) | |
| tree | 79be1ea80621ea2d0a5f52ee6cea87e931d2d75c /source/blender/src/toolbox.c | |
| parent | 64dd90af0b7abb62d3bf786a479061adf54c501b (diff) | |
Added a new option for 'Apply Object', (Ctrl+A) Called "Apply Visual Transform to Loc/Size/Rot"
Since there was no easy way to apply a constraint's transformation back to the original objects transformation.
Also adjusted how Apply Scale/Rot works so that it wont change some objects then raise an error and leave others unchanged, better to check first so it changes everything or nothing.
Diffstat (limited to 'source/blender/src/toolbox.c')
| -rw-r--r-- | source/blender/src/toolbox.c | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/source/blender/src/toolbox.c b/source/blender/src/toolbox.c index 244e1ffd7c3..f9585eff783 100644 --- a/source/blender/src/toolbox.c +++ b/source/blender/src/toolbox.c @@ -1272,12 +1272,15 @@ static void tb_do_transform_clearapply(void *arg, int event) clear_object('s'); break; case 3: /* apply scale/rotation */ - apply_object(); + apply_objects_locrot(); break; - case 4: /* apply deformation */ + case 4: /* apply scale/rotation */ + apply_objects_visual_tx(); + break; + case 5: /* apply deformation */ object_apply_deform(ob); break; - case 5: /* make duplicates real */ + case 6: /* make duplicates real */ if (ob->transflag & OB_DUPLI) make_duplilist_real(); else error("The active object does not have dupliverts"); break; @@ -1289,9 +1292,10 @@ static TBitem tb_transform_clearapply[]= { { 0, "Clear Rotation|Alt R", 1, NULL}, { 0, "Clear Scale|Alt S", 2, NULL}, { 0, "SEPR", 0, NULL}, -{ 0, "Apply Scale/Rotation|Ctrl A", 3, NULL}, -{ 0, "Apply Deformation|Shift Ctrl A", 4, NULL}, -{ 0, "Make Duplicates Real|Shift Ctrl A", 5, NULL}, +{ 0, "Apply Scale/Rotation to ObData|Ctrl A, 1", 3, NULL}, +{ 0, "Apply Visual Transform|Ctrl A, 2", 4, NULL}, +{ 0, "Apply Deformation|Shift Ctrl A", 5, NULL}, +{ 0, "Make Duplicates Real|Shift Ctrl A", 6, NULL}, { -1, "", 0, tb_do_transform_clearapply}}; static TBitem tb_transform_snap[]= { |