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:
authorSergey Sharybin <sergey.vfx@gmail.com>2015-03-10 22:01:53 +0300
committerSergey Sharybin <sergey.vfx@gmail.com>2015-03-10 22:04:59 +0300
commit26d7b6c51792e0b601ae24e88308eaefb66e3b8b (patch)
treed70d677a7da73c9034a7eb99b9c452ebdcfed31d /source/blender/editors/include/ED_render.h
parent56c0a3faef74658fec4769d986253023958e6c36 (diff)
Fix T43831: Image Editor: Render info not displayed
Issue was caused by b62c2a9 and root of it goes to the fact that text info is stored in the "main" scene, not the currently rendering one. This is a bit annoying but making it so text and result are coming from the same scene is a bit dangerous to do now. Will re-visit this change after the release and see if it might be done in a more clear fashion.
Diffstat (limited to 'source/blender/editors/include/ED_render.h')
-rw-r--r--source/blender/editors/include/ED_render.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/source/blender/editors/include/ED_render.h b/source/blender/editors/include/ED_render.h
index de3843c91eb..293621c3d19 100644
--- a/source/blender/editors/include/ED_render.h
+++ b/source/blender/editors/include/ED_render.h
@@ -55,6 +55,7 @@ void ED_render_scene_update(struct Main *bmain, struct Scene *scene, int updated
void ED_viewport_render_kill_jobs(struct wmWindowManager *wm, struct Main *bmain, bool free_database);
struct Scene *ED_render_job_get_scene(const struct bContext *C);
+struct Scene *ED_render_job_get_current_scene(const struct bContext *C);
/* Render the preview
*