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:
authorMatt Ebb <matt@mke3.net>2010-03-11 10:43:49 +0300
committerMatt Ebb <matt@mke3.net>2010-03-11 10:43:49 +0300
commit69a7060678e96b53548a14f22a83510f4d9edcd0 (patch)
treefb71d769da6be215a184099a7e059f431066982c /source/blender/nodes
parent5ec57e80b059be1989bcf4df3ab9f235669f34cc (diff)
Restored Environment maps
* Fixed up RNA and UI * Brought back 'Save' and 'Clear' operators (in the little triangle menu in environment map properties) * While I was at it, noticed that environment maps were only using 8bit colour, changed it to use full 32bit float instead for proper HDR colour etc, so environment map reflections have the correct colour range --> http://mke3.net/blender/devel/2.5/env_hdr.jpg This fixes [#20904] Environment Map does not render; also missing panel
Diffstat (limited to 'source/blender/nodes')
-rw-r--r--source/blender/nodes/intern/CMP_nodes/CMP_outputFile.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/source/blender/nodes/intern/CMP_nodes/CMP_outputFile.c b/source/blender/nodes/intern/CMP_nodes/CMP_outputFile.c
index 43a50235f9f..d2eb27d13c6 100644
--- a/source/blender/nodes/intern/CMP_nodes/CMP_outputFile.c
+++ b/source/blender/nodes/intern/CMP_nodes/CMP_outputFile.c
@@ -54,7 +54,9 @@ static void node_composit_exec_output_file(void *data, bNode *node, bNodeStack *
ibuf->rect_float= cbuf->rect;
ibuf->dither= rd->dither_intensity;
- ibuf->profile = IB_PROFILE_LINEAR_RGB;
+
+ if (rd->color_mgt_flag & R_COLOR_MANAGEMENT)
+ ibuf->profile = IB_PROFILE_LINEAR_RGB;
if(in[1]->data) {
CompBuf *zbuf= in[1]->data;