[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [50503] branches/soc-2011-tomato: Color Management: finish pipeline changes
Sergey Sharybin
sergey.vfx at gmail.com
Mon Sep 10 13:46:15 CEST 2012
Revision: 50503
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=50503
Author: nazgul
Date: 2012-09-10 11:46:15 +0000 (Mon, 10 Sep 2012)
Log Message:
-----------
Color Management: finish pipeline changes
This commit hopefully finishes color management pipeline changes, implements
some missed functionality and fixes some bugs.
Mainly changes are related on getting rid of old Color Management flag which
became counter-intuitive in conjunction with OpenColorIO.
Now color management is always assuming to be enabled and non-color managed
pipeline is emulated using display device called None. This display has got
single view which is basically NO-OP (raw) transformation, not applying any
tone curve and displays colors AS-IS. In most cases it behaves the same as
disabling Color Management in shading panel, but there is at least one known
difference in behavior: compositor and sequence editors would output images
in linear space, not in sRGB as it used to be before.
It'll be quite tricky to make this behave in exactly the same way as it
used to, and not sure if we really need to do it.
3D viewport is supposed to be working in sRGB space, no tonemaps would be
applied there. This is another case where compatibility breaks in comparison
with old color management pipeline, but supporting display transformation
would be tricky since it'll also be needed to make GLSL shaders, textures
and so be aware of display transform.
Interface is now aware of display transformation, but it only uses default
display view, no exposure, gamma or curve mapping is supported there.
This is so color widgets could apply display transformation in both
directions. Such behavior is a bit counter-intuitive, but it's currently
the only way to make color picking working smoothly. In theory we'll need
to support color picking color space, but it'll be also a bit tricky since
in Blender display transform is configurable from the interface and could
be used for artistics needs and in such design it's not possible to figure
out invertable color space which could be used for color picking.
In other software it's not so big issue since all color spaces, display
transform and so are strictly defined by pipeline and in this case it is
possible to define color picking space which would be close enough to
display space.
Sequencer's color space now could be configured from the interface --
it's settings are situated in Scene buttons, Color Management panel.
Default space is sRGB. It was made configurable because we used vd16
color space during Mango which was close to Film view used by grading
department.
Sequencer will convert float buffers to this color space before operating
with them hopefully giving better results. Byte buffers wouldn't be
converted to this color space an they'll be handled in their own colors[ace.
Converting them to sequencer's working space would lead to precision loss
without much visible benefits. It shouldn't be an issue since float and
byte images would never be blended together -- byte image would be converted
to float first if it's needed to be blended with float image.
Byte buffers now allowed to be color managed. This was needed to make code
in such areas as baking and rendering don't have hardcoded linear to sRGB
conversions, making things more clear from code point of view.
Input color space is now assigning on image/movie clip load and default
roles are used for this. So for float images default space would be rec709
and for byte images default space would be sRGB.
Added Non-Color color space which is aimed to be used for such things as
normal/heights maps. It's currently the same as raw colorspace, just has
got more clear naming for users. Probably we'll also need to make it not
affected by display transformation.
Think this is all main pipeline-related changes, more details would be there:
http://wiki.blender.org/index.php/Dev:Ref/Release_Notes/2.64/Color_Management
Other changes and fixes:
- Lots of internal code clean up in color management module.
- Made OpenColorIO module using guarded memory allocation. This allowed to
fix couple of memory leaks and would help preventing leaks in the future.
- Made sure color unpremultiply and dither are supported by all OpenColorIO
defined color transformations.
- Made compositor's preview images be aware of display transformation.
Legacy compositor still uses old Color Management flags, but likely we'll
disable compositor for the release and remove legacy code soon, so don't
think we'll need to spend time on porting that code to new color management
system.
- Made OpenGL rendering be aware of display transform when saving render
result. Now it behaves in the same way as regular rendering.
TODO:
- HSV widgets are using linear rgb/sRGB conversions for single channel,
not sure how this should be ported to new color pipeline.
- Image stamp would use hardcoded linear rgb to sRGB conversion for
filling rectangles. Probably it should use default display view
for this instead, would check this with Brecht.
- Get rid of None color space which was only used for compatibility reasons.
- Made it more clear which color spaces could be used as input space.
- There're also some remained TODO's in the code marked as OCIO_TODO,
but wouldn't consider them as stoppers for at least this commit.
Modified Paths:
--------------
branches/soc-2011-tomato/intern/opencolorio/CMakeLists.txt
branches/soc-2011-tomato/intern/opencolorio/SConscript
branches/soc-2011-tomato/intern/opencolorio/ocio_capi.cpp
branches/soc-2011-tomato/intern/opencolorio/ocio_capi.h
branches/soc-2011-tomato/release/datafiles/colormanagement/config.ocio
branches/soc-2011-tomato/release/scripts/startup/bl_ui/properties_render.py
branches/soc-2011-tomato/release/scripts/startup/bl_ui/properties_scene.py
branches/soc-2011-tomato/source/blender/blenkernel/BKE_colortools.h
branches/soc-2011-tomato/source/blender/blenkernel/BKE_node.h
branches/soc-2011-tomato/source/blender/blenkernel/BKE_scene.h
branches/soc-2011-tomato/source/blender/blenkernel/BKE_sequencer.h
branches/soc-2011-tomato/source/blender/blenkernel/intern/colortools.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/image.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/scene.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/seqeffects.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/sequencer.c
branches/soc-2011-tomato/source/blender/blenloader/intern/readfile.c
branches/soc-2011-tomato/source/blender/compositor/COM_compositor.h
branches/soc-2011-tomato/source/blender/compositor/intern/COM_CompositorContext.cpp
branches/soc-2011-tomato/source/blender/compositor/intern/COM_CompositorContext.h
branches/soc-2011-tomato/source/blender/compositor/intern/COM_ExecutionSystem.cpp
branches/soc-2011-tomato/source/blender/compositor/intern/COM_ExecutionSystem.h
branches/soc-2011-tomato/source/blender/compositor/intern/COM_Node.cpp
branches/soc-2011-tomato/source/blender/compositor/intern/COM_Node.h
branches/soc-2011-tomato/source/blender/compositor/intern/COM_compositor.cpp
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_BlurNode.cpp
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_BokehImageNode.cpp
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_ChannelMatteNode.cpp
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_ChromaMatteNode.cpp
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_ColorMatteNode.cpp
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_CompositorNode.cpp
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_DespeckleNode.cpp
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_DifferenceMatteNode.cpp
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_DilateErodeNode.cpp
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_DistanceMatteNode.cpp
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_FilterNode.cpp
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_ImageNode.cpp
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_LuminanceMatteNode.cpp
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_MixNode.cpp
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_MovieClipNode.cpp
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_OutputFileNode.cpp
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_RenderLayersNode.cpp
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_RenderLayersNode.h
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_SplitViewerNode.cpp
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_TextureNode.cpp
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_ViewerNode.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_OutputFileOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_OutputFileOperation.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_PreviewOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_PreviewOperation.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_SplitViewerOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_ViewerBaseOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_ViewerBaseOperation.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_ViewerOperation.cpp
branches/soc-2011-tomato/source/blender/editors/include/ED_view3d.h
branches/soc-2011-tomato/source/blender/editors/interface/interface.c
branches/soc-2011-tomato/source/blender/editors/interface/interface_draw.c
branches/soc-2011-tomato/source/blender/editors/interface/interface_handlers.c
branches/soc-2011-tomato/source/blender/editors/interface/interface_intern.h
branches/soc-2011-tomato/source/blender/editors/interface/interface_ops.c
branches/soc-2011-tomato/source/blender/editors/interface/interface_regions.c
branches/soc-2011-tomato/source/blender/editors/interface/interface_widgets.c
branches/soc-2011-tomato/source/blender/editors/object/object_bake.c
branches/soc-2011-tomato/source/blender/editors/render/render_internal.c
branches/soc-2011-tomato/source/blender/editors/render/render_opengl.c
branches/soc-2011-tomato/source/blender/editors/render/render_preview.c
branches/soc-2011-tomato/source/blender/editors/sculpt_paint/paint_image.c
branches/soc-2011-tomato/source/blender/editors/space_image/image_buttons.c
branches/soc-2011-tomato/source/blender/editors/space_image/image_draw.c
branches/soc-2011-tomato/source/blender/editors/space_image/image_ops.c
branches/soc-2011-tomato/source/blender/editors/space_image/space_image.c
branches/soc-2011-tomato/source/blender/editors/space_node/node_edit.c
branches/soc-2011-tomato/source/blender/editors/space_sequencer/sequencer_view.c
branches/soc-2011-tomato/source/blender/editors/space_view3d/drawmesh.c
branches/soc-2011-tomato/source/blender/editors/space_view3d/view3d_draw.c
branches/soc-2011-tomato/source/blender/gpu/intern/gpu_draw.c
branches/soc-2011-tomato/source/blender/gpu/intern/gpu_material.c
branches/soc-2011-tomato/source/blender/imbuf/IMB_colormanagement.h
branches/soc-2011-tomato/source/blender/imbuf/IMB_imbuf_types.h
branches/soc-2011-tomato/source/blender/imbuf/intern/IMB_colormanagement_intern.h
branches/soc-2011-tomato/source/blender/imbuf/intern/allocimbuf.c
branches/soc-2011-tomato/source/blender/imbuf/intern/colormanagement.c
branches/soc-2011-tomato/source/blender/makesdna/DNA_color_types.h
branches/soc-2011-tomato/source/blender/makesdna/DNA_scene_types.h
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_image_api.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_scene.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_space.c
branches/soc-2011-tomato/source/blender/nodes/composite/node_composite_tree.c
branches/soc-2011-tomato/source/blender/nodes/composite/node_composite_util.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_image.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_outputFile.c
branches/soc-2011-tomato/source/blender/render/intern/include/render_result.h
branches/soc-2011-tomato/source/blender/render/intern/source/envmap.c
branches/soc-2011-tomato/source/blender/render/intern/source/pipeline.c
branches/soc-2011-tomato/source/blender/render/intern/source/render_result.c
branches/soc-2011-tomato/source/blender/render/intern/source/render_texture.c
branches/soc-2011-tomato/source/blender/render/intern/source/rendercore.c
branches/soc-2011-tomato/source/blender/render/intern/source/shadeinput.c
branches/soc-2011-tomato/source/blender/windowmanager/intern/wm_files.c
Modified: branches/soc-2011-tomato/intern/opencolorio/CMakeLists.txt
===================================================================
--- branches/soc-2011-tomato/intern/opencolorio/CMakeLists.txt 2012-09-10 10:58:59 UTC (rev 50502)
+++ branches/soc-2011-tomato/intern/opencolorio/CMakeLists.txt 2012-09-10 11:46:15 UTC (rev 50503)
@@ -29,7 +29,7 @@
)
set(INC_SYS
-
+ ../guardedalloc
)
set(SRC
Modified: branches/soc-2011-tomato/intern/opencolorio/SConscript
===================================================================
--- branches/soc-2011-tomato/intern/opencolorio/SConscript 2012-09-10 10:58:59 UTC (rev 50502)
+++ branches/soc-2011-tomato/intern/opencolorio/SConscript 2012-09-10 11:46:15 UTC (rev 50503)
@@ -4,7 +4,7 @@
sources = env.Glob('*.cpp')
-incs = '.'
+incs = '. ../guardedalloc'
incs += ' ' + env['BF_OCIO_INC']
if env['OURPLATFORM'] in ('win32-vc', 'win64-vc'):
Modified: branches/soc-2011-tomato/intern/opencolorio/ocio_capi.cpp
===================================================================
--- branches/soc-2011-tomato/intern/opencolorio/ocio_capi.cpp 2012-09-10 10:58:59 UTC (rev 50502)
+++ branches/soc-2011-tomato/intern/opencolorio/ocio_capi.cpp 2012-09-10 11:46:15 UTC (rev 50503)
@@ -28,6 +28,7 @@
#include <OpenColorIO/OpenColorIO.h>
+#include "MEM_guardedalloc.h"
#define OCIO_CAPI_IMPLEMENTATION
#include "ocio_capi.h"
@@ -39,6 +40,13 @@
# define OCIO_abort() abort()
#endif
+#if defined(_MSC_VER)
+# define __func__ __FUNCTION__
+#endif
+
+#define MEM_NEW(type) new(MEM_mallocN(sizeof(type), __func__)) type()
+#define MEM_DELETE(what, type) { what->~type(); MEM_freeN(what); } (void)0
+
static void OCIO_reportError(const char *err)
{
std::cerr << "OpenColorIO Error: " << err << std::endl;
@@ -53,7 +61,8 @@
ConstConfigRcPtr *OCIO_getCurrentConfig(void)
{
- ConstConfigRcPtr *config = new ConstConfigRcPtr();
+ ConstConfigRcPtr *config = MEM_NEW(ConstConfigRcPtr);
+
try {
*config = GetCurrentConfig();
@@ -79,7 +88,7 @@
ConstConfigRcPtr *OCIO_configCreateFromEnv(void)
{
- ConstConfigRcPtr *config = new ConstConfigRcPtr();
+ ConstConfigRcPtr *config = MEM_NEW(ConstConfigRcPtr);
try {
*config = Config::CreateFromEnv();
@@ -97,7 +106,7 @@
ConstConfigRcPtr *OCIO_configCreateFromFile(const char *filename)
{
- ConstConfigRcPtr *config = new ConstConfigRcPtr();
+ ConstConfigRcPtr *config = MEM_NEW(ConstConfigRcPtr);
try {
*config = Config::CreateFromFile(filename);
@@ -114,7 +123,7 @@
void OCIO_configRelease(ConstConfigRcPtr *config)
{
- delete config;
+ MEM_DELETE(config, ConstConfigRcPtr);
}
int OCIO_configGetNumColorSpaces(ConstConfigRcPtr *config)
@@ -143,7 +152,7 @@
ConstColorSpaceRcPtr *OCIO_configGetColorSpace(ConstConfigRcPtr *config, const char *name)
{
- ConstColorSpaceRcPtr *cs = new ConstColorSpaceRcPtr();
+ ConstColorSpaceRcPtr *cs = MEM_NEW(ConstColorSpaceRcPtr);
try {
*cs = (*config)->getColorSpace(name);
@@ -153,7 +162,7 @@
}
catch (Exception &exception) {
OCIO_reportException(exception);
- delete cs;
+ MEM_DELETE(cs, ConstColorSpaceRcPtr);
}
return NULL;
@@ -257,12 +266,12 @@
void OCIO_colorSpaceRelease(ConstColorSpaceRcPtr *cs)
{
- delete cs;
+ MEM_DELETE(cs, ConstColorSpaceRcPtr);
}
ConstProcessorRcPtr *OCIO_configGetProcessorWithNames(ConstConfigRcPtr *config, const char *srcName, const char *dstName)
{
- ConstProcessorRcPtr *p = new ConstProcessorRcPtr();
+ ConstProcessorRcPtr *p = MEM_NEW(ConstProcessorRcPtr);
try {
*p = (*config)->getProcessor(srcName, dstName);
@@ -279,7 +288,7 @@
ConstProcessorRcPtr *OCIO_configGetProcessor(ConstConfigRcPtr *config, ConstTransformRcPtr *transform)
{
- ConstProcessorRcPtr *p = new ConstProcessorRcPtr();
+ ConstProcessorRcPtr *p = MEM_NEW(ConstProcessorRcPtr);
try {
*p = (*config)->getProcessor(*transform);
@@ -367,7 +376,8 @@
void OCIO_processorRelease(ConstProcessorRcPtr *p)
{
- delete p;
+ p->~ConstProcessorRcPtr();
+ MEM_freeN(p);
}
const char *OCIO_colorSpaceGetName(ConstColorSpaceRcPtr *cs)
@@ -387,7 +397,7 @@
DisplayTransformRcPtr *OCIO_createDisplayTransform(void)
{
- DisplayTransformRcPtr *dt = new DisplayTransformRcPtr();
+ DisplayTransformRcPtr *dt = MEM_NEW(DisplayTransformRcPtr);
*dt = DisplayTransform::Create();
@@ -421,15 +431,15 @@
void OCIO_displayTransformRelease(DisplayTransformRcPtr *dt)
{
- delete dt;
- dt = NULL;
+ MEM_DELETE(dt, DisplayTransformRcPtr);
}
PackedImageDesc *OCIO_createPackedImageDesc(float *data, long width, long height, long numChannels,
- long chanStrideBytes, long xStrideBytes, long yStrideBytes)
+ long chanStrideBytes, long xStrideBytes, long yStrideBytes)
{
try {
- PackedImageDesc *id = new PackedImageDesc(data, width, height, numChannels, chanStrideBytes, xStrideBytes, yStrideBytes);
+ void *mem = MEM_mallocN(sizeof(PackedImageDesc), __func__);
+ PackedImageDesc *id = new(mem) PackedImageDesc(data, width, height, numChannels, chanStrideBytes, xStrideBytes, yStrideBytes);
return id;
}
@@ -442,13 +452,12 @@
void OCIO_packedImageDescRelease(PackedImageDesc* id)
{
- delete id;
- id = NULL;
+ MEM_DELETE(id, PackedImageDesc);
}
ExponentTransformRcPtr *OCIO_createExponentTransform(void)
{
- ExponentTransformRcPtr *et = new ExponentTransformRcPtr();
+ ExponentTransformRcPtr *et = MEM_NEW(ExponentTransformRcPtr);
*et = ExponentTransform::Create();
@@ -462,12 +471,12 @@
void OCIO_exponentTransformRelease(ExponentTransformRcPtr *et)
{
- delete et;
+ MEM_DELETE(et, ExponentTransformRcPtr);
}
MatrixTransformRcPtr *OCIO_createMatrixTransform(void)
{
- MatrixTransformRcPtr *mt = new MatrixTransformRcPtr();
+ MatrixTransformRcPtr *mt = MEM_NEW(MatrixTransformRcPtr);
*mt = MatrixTransform::Create();
@@ -481,7 +490,7 @@
void OCIO_matrixTransformRelease(MatrixTransformRcPtr *mt)
{
- delete mt;
+ MEM_DELETE(mt, MatrixTransformRcPtr);
}
void OCIO_matrixTransformScale(float * m44, float * offset4, const float *scale4f)
Modified: branches/soc-2011-tomato/intern/opencolorio/ocio_capi.h
===================================================================
--- branches/soc-2011-tomato/intern/opencolorio/ocio_capi.h 2012-09-10 10:58:59 UTC (rev 50502)
+++ branches/soc-2011-tomato/intern/opencolorio/ocio_capi.h 2012-09-10 11:46:15 UTC (rev 50503)
@@ -39,10 +39,12 @@
#ifndef OCIO_CAPI_IMPLEMENTATION
- #define OCIO_ROLE_SCENE_LINEAR "scene_linear"
- #define OCIO_ROLE_COLOR_PICKING "color_picking"
- #define OCIO_ROLE_TEXTURE_PAINT "texture_paint"
- #define OCIO_ROLE_SEQUENCER "sequencer"
+ #define OCIO_ROLE_SCENE_LINEAR "scene_linear"
+ #define OCIO_ROLE_COLOR_PICKING "color_picking"
+ #define OCIO_ROLE_TEXTURE_PAINT "texture_paint"
+ #define OCIO_ROLE_DEFAULT_BYTE "default_byte"
+ #define OCIO_ROLE_DEFAULT_FLOAT "default_float"
+ #define OCIO_ROLE_DEFAULT_SEQUENCER "default_sequencer"
OCIO_DECLARE_HANDLE(ConstConfigRcPtr);
OCIO_DECLARE_HANDLE(ConstColorSpaceRcPtr);
Modified: branches/soc-2011-tomato/release/datafiles/colormanagement/config.ocio
===================================================================
--- branches/soc-2011-tomato/release/datafiles/colormanagement/config.ocio 2012-09-10 10:58:59 UTC (rev 50502)
+++ branches/soc-2011-tomato/release/datafiles/colormanagement/config.ocio 2012-09-10 11:46:15 UTC (rev 50503)
@@ -1,3 +1,7 @@
+# OpenCOlorIO configuration file for Blender
+#
+# Based on aces, nuke-default and spi configurations from OpenColorIO-Config
+
ocio_profile_version: 1
search_path: luts
@@ -7,11 +11,23 @@
description: RRT version ut33
roles:
- color_picking: raw
reference: aces
+
+ # Internal scene linear space
scene_linear: rec709
+
+ # Default color space for byte image
+ default_byte: sRGB
+
+ # Default color space for float images
+ default_float: rec709
+
+ # Default color space sequencer is working in
+ default_sequencer: sRGB
+
+ # Color spaces for color picking and exture painting (not internally supported yet)
+ color_picking: raw
texture_paint: raw
- sequencer: vd16
displays:
sRGB:
@@ -33,8 +49,10 @@
- !<View> {name: DCI, colorspace: dci_xyz}
- !<View> {name: Raw, colorspace: raw}
- !<View> {name: Log, colorspace: adx10}
+ None:
+ - !<View> {name: Default, colorspace: raw}
-active_displays: [sRGB, P3DCI, Rec709, XYZ]
+active_displays: [sRGB, P3DCI, Rec709, XYZ, None]
active_views: [Default, RRT, Raw, Log]
colorspaces:
@@ -238,3 +256,14 @@
children:
- !<FileTransform> {src: vd16.spi1d, interpolation: nearest}
- !<FileTransform> {src: rec709_to_aces.spimtx, interpolation: linear}
+
+ - !<ColorSpace>
+ name: Non-Color
+ family: raw
+ description: |
+ Color space used for images which contains non-color data (i,e, normal maps)
+ equalitygroup:
+ bitdepth: 32f
+ isdata: true
+ allocation: uniform
+ allocationvars: [0, 1]
Modified: branches/soc-2011-tomato/release/scripts/startup/bl_ui/properties_render.py
===================================================================
--- branches/soc-2011-tomato/release/scripts/startup/bl_ui/properties_render.py 2012-09-10 10:58:59 UTC (rev 50502)
+++ branches/soc-2011-tomato/release/scripts/startup/bl_ui/properties_render.py 2012-09-10 11:46:15 UTC (rev 50503)
@@ -316,10 +316,7 @@
col = split.column()
col.prop(rd, "use_raytrace", text="Ray Tracing")
- col.prop(rd, "use_color_management")
- sub = col.row()
- sub.active = rd.use_color_management == True
- sub.prop(rd, "use_color_unpremultiply")
+ col.prop(rd, "use_color_unpremultiply")
col.prop(rd, "alpha_mode", text="Alpha")
Modified: branches/soc-2011-tomato/release/scripts/startup/bl_ui/properties_scene.py
===================================================================
--- branches/soc-2011-tomato/release/scripts/startup/bl_ui/properties_scene.py 2012-09-10 10:58:59 UTC (rev 50502)
+++ branches/soc-2011-tomato/release/scripts/startup/bl_ui/properties_scene.py 2012-09-10 11:46:15 UTC (rev 50503)
@@ -242,10 +242,21 @@
scene = context.scene
- layout.prop(scene.display_settings, "display_device")
- layout.template_colormanaged_view_settings(scene, "view_settings")
+ col = layout.column()
+ col.label(text="Display:")
+ col.prop(scene.display_settings, "display_device")
+ col = layout.column()
+ col.separator()
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list