Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTon Roosendaal <ton@blender.org>2004-11-07 01:29:24 +0300
committerTon Roosendaal <ton@blender.org>2004-11-07 01:29:24 +0300
commit6423ccff411d34273143177f917ea014d1c341f8 (patch)
treeb3cf7581b8ae3df48207349d2922dfd986613633 /source/blender/src/editobject.c
parentf4efd433fa4cd693733d6775806c3a5d326d5bf0 (diff)
Fix, as reported by Martin; the 'make dupli real' code would also apply
size and rotation.
Diffstat (limited to 'source/blender/src/editobject.c')
-rw-r--r--source/blender/src/editobject.c16
1 files changed, 10 insertions, 6 deletions
diff --git a/source/blender/src/editobject.c b/source/blender/src/editobject.c
index 2b5aaf9a2c3..2e87e81a7e8 100644
--- a/source/blender/src/editobject.c
+++ b/source/blender/src/editobject.c
@@ -2868,14 +2868,18 @@ void apply_object()
ob= OBACT;
if(ob==0) return;
- if(ob->transflag & OB_DUPLI) make_duplilist_real();
+ if(ob->transflag & OB_DUPLI) {
+ make_duplilist_real();
+ }
else {
- if(okee("Apply deformation")==0) return;
- object_apply_deform(ob);
- allqueue(REDRAWVIEW3D, 0);
-
- return;
+ if(okee("Apply deformation")==0) {
+ object_apply_deform(ob);
+ BIF_undo_push("Apply deformation");
+ }
}
+ allqueue(REDRAWVIEW3D, 0);
+
+ return;
}
if(okee("Apply size and rotation")==0) return;