diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2015-03-17 22:09:54 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2015-03-17 22:10:58 +0300 |
| commit | 63897304a90a8b13304771af0f466f6d13cb9227 (patch) | |
| tree | 98b5c235a64b29b81d9a494fbe60972a4fe5135f /source | |
| parent | 2ab4489f179eebb1f1070a1d32f01f4e7f0c85c7 (diff) | |
Fix T44028: Vertex Colors Baking error
Was wrong color management flag used for some bakers.
Actually goes back to 7997e38.
Diffstat (limited to 'source')
| -rw-r--r-- | source/blender/render/intern/source/bake.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/source/blender/render/intern/source/bake.c b/source/blender/render/intern/source/bake.c index 4aa2f4e919e..b602753dff4 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 */ |