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-12-22 23:30:13 +0300
committerTon Roosendaal <ton@blender.org>2004-12-22 23:30:13 +0300
commitdeb64cc37ce06a44db26ef890da3e0a9a2c70514 (patch)
tree3888cf48f295abb8fe80895934a94ec6ee87e16a
parent59c0ec4b61a1e3c97969870be17a2adef46cccac (diff)
Another last minute bug... (thanks aphex)
Add text, TAB, CTR+Z, TAB -> crash... :/ Just forgot 1 if()... was there for weeks! So...
-rw-r--r--source/blender/src/editobject.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/src/editobject.c b/source/blender/src/editobject.c
index 3018ebe6073..9a65370c69e 100644
--- a/source/blender/src/editobject.c
+++ b/source/blender/src/editobject.c
@@ -199,13 +199,14 @@ void add_object_draw(int type) /* for toolbox or menus, only non-editmode stuff
ob= add_object(type);
base_init_from_view3d(BASACT, G.vd);
+ /* only undo pushes on objects without editmode... */
if(type==OB_EMPTY) BIF_undo_push("Add Empty");
else if(type==OB_LAMP) {
BIF_undo_push("Add Lamp");
if(G.vd->drawtype == OB_SHADED) reshadeall_displist();
}
else if(type==OB_LATTICE) BIF_undo_push("Add Lattice");
- else BIF_undo_push("Add Camera");
+ else if(type==OB_CAMERA) BIF_undo_push("Add Camera");
allqueue(REDRAWVIEW3D, 0);
}