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-10-22 18:03:20 +0400
committerTon Roosendaal <ton@blender.org>2004-10-22 18:03:20 +0400
commit070d01dd68e76180807111f9e5680d3b2a1f68df (patch)
tree9fae663ced0589250f299f9f4adbec1bd5446848
parenteecaa4cb50964bfd1bbcc5107fd265082ec96c75 (diff)
Two fixes!
- undo system didn't work in editmode AT ALL!!! (stupid me) - Lattice deform on non-subsurfed objects did not update
-rw-r--r--source/blender/src/drawobject.c1
-rw-r--r--source/blender/src/editmode_undo.c2
2 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/src/drawobject.c b/source/blender/src/drawobject.c
index d4e31e1a288..9bdbfc7ef9c 100644
--- a/source/blender/src/drawobject.c
+++ b/source/blender/src/drawobject.c
@@ -4130,6 +4130,7 @@ void draw_object(Base *base)
/* check for need for displist (it's zero when parent, key, or hook changed) */
if(ob->disp.first==NULL) {
if(ob->parent && ob->partype==PARSKEL) makeDispList(ob);
+ else if(ob->parent && ob->parent->type==OB_LATTICE) makeDispList(ob);
else if(ob->hooks.first) makeDispList(ob);
else if(ob->softflag) makeDispList(ob);
else if(me->disp.first==NULL && mesh_uses_displist(me)) makeDispList(ob);
diff --git a/source/blender/src/editmode_undo.c b/source/blender/src/editmode_undo.c
index 1715b7382f7..18ec5596de3 100644
--- a/source/blender/src/editmode_undo.c
+++ b/source/blender/src/editmode_undo.c
@@ -173,7 +173,7 @@ void undo_editmode_push(char *name, void (*freedata)(void *),
/* copy */
curundo->undodata= curundo->from_editmode();
-
+ curundo->ob= G.obedit;
curundo->id= G.obedit->id;
}