Revision: 32470
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=32470
Author: campbellbarton
Date: 2010-10-14 13:33:51 +0200 (Thu, 14 Oct 2010)
Log Message:
-----------
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.
Modified Paths:
--------------
trunk/blender/source/blender/editors/interface/interface_intern.h
trunk/blender/source/blender/editors/interface/interface_regions.c
trunk/blender/source/blender/editors/space_image/CMakeLists.txt
trunk/blender/source/blender/editors/space_image/SConscript
Modified: trunk/blender/source/blender/editors/interface/interface_intern.h
===================================================================
--- trunk/blender/source/blender/editors/interface/interface_intern.h
2010-10-14 10:34:04 UTC (rev 32469)
+++ trunk/blender/source/blender/editors/interface/interface_intern.h
2010-10-14 11:33:51 UTC (rev 32470)
@@ -303,15 +303,16 @@
short auto_open;
double auto_open_last;
+ char *lockstr;
+
+ char lock;
char active; // to keep blocks while
drawing and free them afterwards
- char tooltipdisabled; // to avoid tooltip after click
- short lock;
- char *lockstr;
+ char tooltipdisabled; // to avoid tooltip after click
+ char endblock; // uiEndBlock done?
float xofs, yofs; // offset to parent
button
int dobounds, mx, my; // for doing delayed
int bounds, minbounds; // for doing delayed
- int endblock; // uiEndBlock done?
rctf safety; // pulldowns, to detect
outside, can differ per case how it is created
ListBase saferct; // uiSafetyRct list
@@ -320,9 +321,10 @@
int puphash; // popup menu hash for memory
- int color_profile; // color profile for
correcting linear colors for display
+ void *evil_C; // XXX hack for dynamic
operator enums
- void *evil_C; // XXX hack for dynamic
operator enums
+ float _hsv[3]; // XXX, only access via
ui_block_hsv_get()
+ char color_profile; // color profile for
correcting linear colors for display
};
typedef struct uiSafetyRct {
@@ -397,7 +399,7 @@
int butretval;
int menuretval;
float retvalue;
- float retvec[8];
+ float retvec[4];
};
uiBlock *ui_block_func_COL(struct bContext *C, uiPopupBlockHandle *handle,
void *arg_but);
Modified: trunk/blender/source/blender/editors/interface/interface_regions.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface_regions.c
2010-10-14 10:34:04 UTC (rev 32469)
+++ trunk/blender/source/blender/editors/interface/interface_regions.c
2010-10-14 11:33:51 UTC (rev 32470)
@@ -1940,9 +1940,7 @@
VECCOPY(handle->retvec, but->editvec);
- block->handle= handle; /* XXX, only for ui_block_hsv_get */
uiBlockPicker(block, handle->retvec, &but->rnapoin, but->rnaprop);
- block->handle= NULL;
block->flag= UI_BLOCK_LOOP|UI_BLOCK_REDRAW|UI_BLOCK_KEEP_OPEN;
uiBoundsBlock(block, 10);
@@ -2440,5 +2438,5 @@
float *ui_block_hsv_get(uiBlock *block)
{
- return block->handle->retvec+4;
+ return block->_hsv;
}
Modified: trunk/blender/source/blender/editors/space_image/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/editors/space_image/CMakeLists.txt
2010-10-14 10:34:04 UTC (rev 32469)
+++ trunk/blender/source/blender/editors/space_image/CMakeLists.txt
2010-10-14 11:33:51 UTC (rev 32470)
@@ -41,6 +41,10 @@
ADD_DEFINITIONS(-DWITH_TIFF)
ENDIF(WITH_IMAGE_TIFF)
+IF(WITH_IMAGE_CINEON)
+ ADD_DEFINITIONS(-DWITH_CINEON)
+ENDIF(WITH_IMAGE_CINEON)
+
IF(WITH_LCMS)
SET(INC ${INC} ${LCMS_INCLUDE_DIR})
ADD_DEFINITIONS(-DWITH_LCMS)
Modified: trunk/blender/source/blender/editors/space_image/SConscript
===================================================================
--- trunk/blender/source/blender/editors/space_image/SConscript 2010-10-14
10:34:04 UTC (rev 32469)
+++ trunk/blender/source/blender/editors/space_image/SConscript 2010-10-14
11:33:51 UTC (rev 32470)
@@ -16,6 +16,8 @@
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']
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
