diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2010-10-14 15:33:51 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2010-10-14 15:33:51 +0400 |
| commit | 5de818670cd1ea130dd10afc7f8b70e0d6d70f5f (patch) | |
| tree | a8e0393a04bc60cc62ef0d3f951dc04fcefef034 /source/blender/editors/space_image/SConscript | |
| parent | 6e2e7c00c1ca2f5053ef989b4d1564c4a1b24e6f (diff) | |
fix for crash in own recent color picker commit, store the hsv color in
block->_hsv, which is only accessed via a function so it can be moved to
a better place later.
also fix cineon define for scons/cmake.
Diffstat (limited to 'source/blender/editors/space_image/SConscript')
| -rw-r--r-- | source/blender/editors/space_image/SConscript | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/source/blender/editors/space_image/SConscript b/source/blender/editors/space_image/SConscript index c7c31352185..15a7aeb828f 100644 --- a/source/blender/editors/space_image/SConscript +++ b/source/blender/editors/space_image/SConscript @@ -16,6 +16,8 @@ if env['WITH_BF_OPENEXR']: defs.append('WITH_OPENEXR') if env['WITH_BF_TIFF']: defs.append('WITH_TIFF') +if env['WITH_BF_CINEON']: + defs.append('WITH_CINEON') if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc'): incs += ' ' + env['BF_PTHREADS_INC'] |