diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2014-01-20 17:19:49 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2014-01-20 17:26:48 +0400 |
| commit | fbf821c50b25b49620a7d7af35321851a547010a (patch) | |
| tree | 9cfe671d73f9a01862777a27f2c454695ba75cc8 /source/blender | |
| parent | 018fe81779e81ad43b16c74969764ae3b71d4b40 (diff) | |
Fix T37967: autosave does not save dynamic topology edits while in sculpt mode.
Diffstat (limited to 'source/blender')
| -rw-r--r-- | source/blender/editors/include/ED_util.h | 2 | ||||
| -rw-r--r-- | source/blender/editors/render/render_internal.c | 1 | ||||
| -rw-r--r-- | source/blender/editors/util/ed_util.c | 2 | ||||
| -rw-r--r-- | source/blender/windowmanager/intern/wm_files.c | 9 |
4 files changed, 3 insertions, 11 deletions
diff --git a/source/blender/editors/include/ED_util.h b/source/blender/editors/include/ED_util.h index fa0e5b6cf84..9d1f88cfc89 100644 --- a/source/blender/editors/include/ED_util.h +++ b/source/blender/editors/include/ED_util.h @@ -46,7 +46,7 @@ struct Mesh; void ED_editors_init(struct bContext *C); void ED_editors_exit(struct bContext *C); -void ED_editors_flush_edits(struct bContext *C, bool for_render); +void ED_editors_flush_edits(const struct bContext *C, bool for_render); /* ************** Undo ************************ */ diff --git a/source/blender/editors/render/render_internal.c b/source/blender/editors/render/render_internal.c index b2eefe63102..e9d1f133181 100644 --- a/source/blender/editors/render/render_internal.c +++ b/source/blender/editors/render/render_internal.c @@ -739,7 +739,6 @@ static int screen_render_invoke(bContext *C, wmOperator *op, const wmEvent *even View3D *v3d = use_viewport ? CTX_wm_view3d(C) : NULL; struct Object *camera_override = v3d ? V3D_CAMERA_LOCAL(v3d) : NULL; const char *name; - Object *active_object = CTX_data_active_object(C); ScrArea *sa; /* only one render job at a time */ diff --git a/source/blender/editors/util/ed_util.c b/source/blender/editors/util/ed_util.c index ab4cd1697ba..44ef8e2093e 100644 --- a/source/blender/editors/util/ed_util.c +++ b/source/blender/editors/util/ed_util.c @@ -143,7 +143,7 @@ void ED_editors_exit(bContext *C) /* flush any temp data from object editing to DNA before writing files, * rendering, copying, etc. */ -void ED_editors_flush_edits(bContext *C, bool for_render) +void ED_editors_flush_edits(const bContext *C, bool for_render) { Object *obact = CTX_data_active_object(C); Object *obedit = CTX_data_edit_object(C); diff --git a/source/blender/windowmanager/intern/wm_files.c b/source/blender/windowmanager/intern/wm_files.c index 71d78a83b00..b99246dc34b 100644 --- a/source/blender/windowmanager/intern/wm_files.c +++ b/source/blender/windowmanager/intern/wm_files.c @@ -1086,8 +1086,6 @@ void wm_autosave_timer(const bContext *C, wmWindowManager *wm, wmTimer *UNUSED(w wmEventHandler *handler; char filepath[FILE_MAX]; - Scene *scene = CTX_data_scene(C); - WM_event_remove_timer(wm, NULL, wm->autosavetimer); /* if a modal operator is running, don't autosave, but try again in 10 seconds */ @@ -1100,12 +1098,7 @@ void wm_autosave_timer(const bContext *C, wmWindowManager *wm, wmTimer *UNUSED(w } } - if (scene) { - Object *ob = OBACT; - - if (ob && ob->mode & OB_MODE_SCULPT) - multires_force_update(ob); - } + ED_editors_flush_edits(C, false); wm_autosave_location(filepath); |