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>2014-03-19 18:21:46 +0400
committerSergey Sharybin <sergey.vfx@gmail.com>2014-03-19 18:22:28 +0400
commit7997e38917159d2779769b2d1a938ca1750e2641 (patch)
tree21b8af1aa164cb3c0d2a6f08d345e626b244d289 /source/blender/render
parent22ab652bb095d1ed69927ab76010fc0e6186799f (diff)
Fix T39233: Face assigned textures bake too bright
Shade input wasn't initialized properly for texture baking.
Diffstat (limited to 'source/blender/render')
-rw-r--r--source/blender/render/intern/source/bake.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/source/blender/render/intern/source/bake.c b/source/blender/render/intern/source/bake.c
index 977c30ff20a..59a2a0d78fc 100644
--- a/source/blender/render/intern/source/bake.c
+++ b/source/blender/render/intern/source/bake.c
@@ -981,6 +981,7 @@ int RE_bake_shade_all_selected(Render *re, int type, Object *actob, short *do_up
int a, vdone = false, result = BAKE_RESULT_OK;
bool use_mask = false;
bool use_displacement_buffer = false;
+ bool do_manage = BKE_scene_check_color_management_enabled(re->scene);
re->scene_color_manage = BKE_scene_check_color_management_enabled(re->scene);
@@ -1040,6 +1041,7 @@ int RE_bake_shade_all_selected(Render *re, int type, Object *actob, short *do_up
}
handles[a].ssamp.shi[0].combinedflag = ~(SCE_PASS_SPEC);
handles[a].ssamp.shi[0].thread = a;
+ handles[a].ssamp.shi[0].do_manage = do_manage;
handles[a].ssamp.tot = 1;
handles[a].type = type;