Fix, as reported by Martin; the 'make dupli real' code would also apply
authorTon Roosendaal <ton@blender.org>
Sat, 6 Nov 2004 22:29:24 +0000 (22:29 +0000)
committerTon Roosendaal <ton@blender.org>
Sat, 6 Nov 2004 22:29:24 +0000 (22:29 +0000)
size and rotation.

source/blender/src/editobject.c

index 2b5aaf9a2c3adc8b2bbb0bedc268c98ef48a52b3..2e87e81a7e80a36df62150890b2ea519cbb1c89b 100644 (file)
@@ -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;