[Bf-blender-cvs] [92a539e] master: Fix T38051: Even if Color Management is disabled, it is still applied to the background

Sergey Sharybin noreply at git.blender.org
Fri Mar 21 09:07:08 CET 2014


Commit: 92a539ec9246aae42eab2d76706bfc5429a554b7
Author: Sergey Sharybin
Date:   Fri Mar 21 14:06:44 2014 +0600
https://developer.blender.org/rB92a539ec9246aae42eab2d76706bfc5429a554b7

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

===================================================================

M	source/gameengine/Converter/BlenderWorldInfo.cpp

===================================================================

diff --git a/source/gameengine/Converter/BlenderWorldInfo.cpp b/source/gameengine/Converter/BlenderWorldInfo.cpp
index be85d89..75beb5d 100644
--- a/source/gameengine/Converter/BlenderWorldInfo.cpp
+++ b/source/gameengine/Converter/BlenderWorldInfo.cpp
@@ -61,6 +61,7 @@
 #include "BLI_math.h"
 
 #include "BKE_global.h"
+#include "BKE_scene.h"
 /* 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_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_backgroundcolor, m_backgroundcolor);
 			linearrgb_to_srgb_v3_v3(m_ambientcolor, m_ambientcolor);




More information about the Bf-blender-cvs mailing list