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@pandora.be>2013-10-04 16:30:00 +0400
committerBrecht Van Lommel <brechtvanlommel@pandora.be>2013-10-04 16:30:00 +0400
commit8cdeba8d67a4af89d57bec21b313817311e65883 (patch)
treea139ca5c998a30106eed1285603031bd361f2e7c /source/blender/editors/include/ED_render.h
parent865fe764dc4d027ad80f03b30a6f741f46c3d675 (diff)
Fix #36948: blender internal viewport render crashes holding shift+Z pressed
to quickly toggle it on/off. Problem is accessing freed data, now the job is ended immediately. Fix based on patch from Sergey and investigation from Bastien.
Diffstat (limited to 'source/blender/editors/include/ED_render.h')
-rw-r--r--source/blender/editors/include/ED_render.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/source/blender/editors/include/ED_render.h b/source/blender/editors/include/ED_render.h
index bdfbbbb9c74..518bee665ae 100644
--- a/source/blender/editors/include/ED_render.h
+++ b/source/blender/editors/include/ED_render.h
@@ -40,6 +40,7 @@ struct Scene;
struct ScrArea;
struct RegionView3D;
struct RenderEngine;
+struct View3D;
/* render_ops.c */
@@ -51,6 +52,7 @@ void ED_render_id_flush_update(struct Main *bmain, struct ID *id);
void ED_render_engine_changed(struct Main *bmain);
void ED_render_engine_area_exit(struct ScrArea *sa);
void ED_render_scene_update(struct Main *bmain, struct Scene *scene, int updated);
+void ED_render_view3d_shade_update(struct Main *bmain, struct View3D *v3d, struct ScrArea *sa);
void ED_viewport_render_kill_jobs(const struct bContext *C, bool free_database);