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:
authorNicholas Bishop <nicholasbishop@gmail.com>2007-01-04 10:48:26 +0300
committerNicholas Bishop <nicholasbishop@gmail.com>2007-01-04 10:48:26 +0300
commit6643cc53d96ecdff119c18a5bf6ccf35726ab37f (patch)
tree725401f8e6b3b8f849575666c09caef175023d27 /source/blender/src/editmode_undo.c
parent31e4149c44780cffd13d3609a7beccf7e6f69822 (diff)
Fixed bug #5592, change from sculpt mode to edit mode crashes 2.43RC1 on OsX Intel. Fix was to check that undo data is taken from the correct object.
Diffstat (limited to 'source/blender/src/editmode_undo.c')
-rw-r--r--source/blender/src/editmode_undo.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/src/editmode_undo.c b/source/blender/src/editmode_undo.c
index 97ad4008f4d..a67a759374d 100644
--- a/source/blender/src/editmode_undo.c
+++ b/source/blender/src/editmode_undo.c
@@ -340,9 +340,9 @@ uiBlock *editmode_undohistorymenu(void *arg_unused)
return block;
}
-void *undo_editmode_get_prev()
+void *undo_editmode_get_prev(Object *ob)
{
UndoElem *ue= undobase.last;
- if(ue && ue->prev) return ue->prev->undodata;
+ if(ue && ue->prev && ue->prev==ob) return ue->prev->undodata;
return NULL;
}