[Bf-blender-cvs] [6389730] master: Fix T44028: Vertex Colors Baking error
Sergey Sharybin
noreply at git.blender.org
Tue Mar 17 20:11:06 CET 2015
Commit: 63897304a90a8b13304771af0f466f6d13cb9227
Author: Sergey Sharybin
Date: Wed Mar 18 00:09:54 2015 +0500
Branches: master
https://developer.blender.org/rB63897304a90a8b13304771af0f466f6d13cb9227
Fix T44028: Vertex Colors Baking error
Was wrong color management flag used for some bakers.
Actually goes back to 7997e38.
===================================================================
M source/blender/render/intern/source/bake.c
===================================================================
diff --git a/source/blender/render/intern/source/bake.c b/source/blender/render/intern/source/bake.c
index 4aa2f4e..b602753 100644
--- a/source/blender/render/intern/source/bake.c
+++ b/source/blender/render/intern/source/bake.c
@@ -984,8 +984,12 @@ 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);
-
+ bool do_manage = false;
+
+ if (ELEM(type, RE_BAKE_ALL, RE_BAKE_TEXTURE)) {
+ do_manage = BKE_scene_check_color_management_enabled(re->scene);
+ }
+
re->scene_color_manage = BKE_scene_check_color_management_enabled(re->scene);
/* initialize render global */
More information about the Bf-blender-cvs
mailing list