Fix T38051: Even if Color Management is disabled, it is still applied to the background

This commit is contained in:
Sergey Sharybin 2014-03-21 14:06:44 +06:00
parent 77c1d17940
commit 92a539ec92

@ -61,6 +61,7 @@
#include "BLI_math.h" #include "BLI_math.h"
#include "BKE_global.h" #include "BKE_global.h"
#include "BKE_scene.h"
/* end of blender include block */ /* end of blender include block */
@ -86,7 +87,7 @@ BlenderWorldInfo::BlenderWorldInfo(struct Scene *blenderscene, struct World *ble
copy_v3_v3(m_backgroundcolor, &blenderworld->horr); copy_v3_v3(m_backgroundcolor, &blenderworld->horr);
copy_v3_v3(m_ambientcolor, &blenderworld->ambr); copy_v3_v3(m_ambientcolor, &blenderworld->ambr);
if (blenderscene->r.color_mgt_flag & R_COLOR_MANAGEMENT) { if (BKE_scene_check_color_management_enabled(blenderscene)) {
linearrgb_to_srgb_v3_v3(m_mistcolor, m_mistcolor); linearrgb_to_srgb_v3_v3(m_mistcolor, m_mistcolor);
linearrgb_to_srgb_v3_v3(m_backgroundcolor, m_backgroundcolor); linearrgb_to_srgb_v3_v3(m_backgroundcolor, m_backgroundcolor);
linearrgb_to_srgb_v3_v3(m_ambientcolor, m_ambientcolor); linearrgb_to_srgb_v3_v3(m_ambientcolor, m_ambientcolor);