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:
authorBrecht Van Lommel <brechtvanlommel@gmail.com>2014-01-20 17:19:49 +0400
committerBrecht Van Lommel <brechtvanlommel@gmail.com>2014-01-20 17:26:48 +0400
commitfbf821c50b25b49620a7d7af35321851a547010a (patch)
tree9cfe671d73f9a01862777a27f2c454695ba75cc8 /source/blender/editors
parent018fe81779e81ad43b16c74969764ae3b71d4b40 (diff)
Fix T37967: autosave does not save dynamic topology edits while in sculpt mode.
Diffstat (limited to 'source/blender/editors')
-rw-r--r--source/blender/editors/include/ED_util.h2
-rw-r--r--source/blender/editors/render/render_internal.c1
-rw-r--r--source/blender/editors/util/ed_util.c2
3 files changed, 2 insertions, 3 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);