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:
authorCampbell Barton <ideasman42@gmail.com>2009-10-29 21:49:36 +0300
committerCampbell Barton <ideasman42@gmail.com>2009-10-29 21:49:36 +0300
commit98527a71061735a20b712a2c4d552c0c966e5798 (patch)
tree8535a11f417538d2cb0e0b48a5783e329356dd62 /source/blender/blenkernel/intern/blender.c
parent88b38c30a1c1b799890b2644391af103fcaeae34 (diff)
various small fixes
- undo stops all running jobs (operator redo was crashing with threaded render) - adding new armatures was crashing if there was no valid view3d - transform with an active hidden object would crash
Diffstat (limited to 'source/blender/blenkernel/intern/blender.c')
-rw-r--r--source/blender/blenkernel/intern/blender.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/source/blender/blenkernel/intern/blender.c b/source/blender/blenkernel/intern/blender.c
index 94b03730e54..a387d1bca9d 100644
--- a/source/blender/blenkernel/intern/blender.c
+++ b/source/blender/blenkernel/intern/blender.c
@@ -536,6 +536,9 @@ static int read_undosave(bContext *C, UndoElem *uel)
char scestr[FILE_MAXDIR+FILE_MAXFILE];
int success=0, fileflags;
+ /* This is needed so undoing/redoing doesnt crash with threaded previews going */
+ WM_jobs_stop(CTX_wm_manager(C), CTX_wm_screen(C));
+
strcpy(scestr, G.sce); /* temporal store */
fileflags= G.fileflags;
G.fileflags |= G_FILE_NO_UI;