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-07-04 22:17:02 +0400
committerBrecht Van Lommel <brechtvanlommel@pandora.be>2013-07-04 22:17:02 +0400
commit6db8fd72f046cf619a7249f5407f9e59fe401e0b (patch)
tree2e463264aec67d0855fc488dd2b966d73a8c95c2 /source/blender/render
parent12d5340a5a78661e0dda466115249fe446ee27e5 (diff)
Fix #35957: blender internal viewport render did not do correct color management
for image textures.
Diffstat (limited to 'source/blender/render')
-rw-r--r--source/blender/render/intern/source/convertblender.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/source/blender/render/intern/source/convertblender.c b/source/blender/render/intern/source/convertblender.c
index 29555756f9f..8db276661ce 100644
--- a/source/blender/render/intern/source/convertblender.c
+++ b/source/blender/render/intern/source/convertblender.c
@@ -5247,6 +5247,9 @@ void RE_Database_FromScene(Render *re, Main *bmain, Scene *scene, unsigned int l
re->main= bmain;
re->scene= scene;
re->lay= lay;
+
+ if(re->r.scemode & R_VIEWPORT_PREVIEW)
+ re->scene_color_manage = BKE_scene_check_color_management_enabled(scene);
/* scene needs to be set to get camera */
camera= RE_GetCamera(re);