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:
authorDalai Felinto <dfelinto@gmail.com>2015-04-07 22:56:26 +0300
committerDalai Felinto <dfelinto@gmail.com>2015-04-07 22:56:31 +0300
commitcc9c049ff7695ba5fa6a48d468bf3d18602d330e (patch)
treea09d91760a2df77f9cc858228226916635e54aa1 /source/blender/blenkernel/intern/image.c
parent4c2306d21a2a1aea37261c5a6c92b6c2bff55e9f (diff)
Multiview: compositor - avoid trashing image viewer views/buffers when multiview is off
I found this while investigating why the backdrop shows 'blank' while I update a node influence factor. This problem still persist, but maybe it was there before multiview. In release it is not noticeable, but in my debug build is quite evident.
Diffstat (limited to 'source/blender/blenkernel/intern/image.c')
-rw-r--r--source/blender/blenkernel/intern/image.c15
1 files changed, 10 insertions, 5 deletions
diff --git a/source/blender/blenkernel/intern/image.c b/source/blender/blenkernel/intern/image.c
index f852d886ae9..bd0daf36147 100644
--- a/source/blender/blenkernel/intern/image.c
+++ b/source/blender/blenkernel/intern/image.c
@@ -2357,11 +2357,16 @@ Image *BKE_image_verify_viewer(int type, const char *name)
static void image_viewer_create_views(const RenderData *rd, Image *ima)
{
- SceneRenderView *srv;
- for (srv = rd->views.first; srv; srv = srv->next) {
- if (BKE_scene_multiview_is_render_view_active(rd, srv) == false)
- continue;
- image_add_view(ima, srv->name, "");
+ if ((rd->scemode & R_MULTIVIEW) == 0) {
+ image_add_view(ima, "", "");
+ }
+ else {
+ SceneRenderView *srv;
+ for (srv = rd->views.first; srv; srv = srv->next) {
+ if (BKE_scene_multiview_is_render_view_active(rd, srv) == false)
+ continue;
+ image_add_view(ima, srv->name, "");
+ }
}
}