[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [25855] trunk/blender/source/blender/ editors/interface: Color picker crash fix.
Martin Poirier
theeth at yahoo.com
Sat Jan 9 20:00:41 CET 2010
Revision: 25855
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=25855
Author: theeth
Date: 2010-01-09 20:00:41 +0100 (Sat, 09 Jan 2010)
Log Message:
-----------
Color picker crash fix.
Color arrays in RNA are 4 floats but handlers used 3 floats. Overflow galore.
Modified Paths:
--------------
trunk/blender/source/blender/editors/interface/interface_intern.h
trunk/blender/source/blender/editors/interface/interface_regions.c
Modified: trunk/blender/source/blender/editors/interface/interface_intern.h
===================================================================
--- trunk/blender/source/blender/editors/interface/interface_intern.h 2010-01-09 18:21:27 UTC (rev 25854)
+++ trunk/blender/source/blender/editors/interface/interface_intern.h 2010-01-09 19:00:41 UTC (rev 25855)
@@ -377,7 +377,7 @@
int butretval;
int menuretval;
float retvalue;
- float retvec[3];
+ 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-01-09 18:21:27 UTC (rev 25854)
+++ trunk/blender/source/blender/editors/interface/interface_regions.c 2010-01-09 19:00:41 UTC (rev 25855)
@@ -1597,7 +1597,7 @@
uiPopupBlockHandle *popup= but->block->handle;
PropertyRNA *prop = but->rnaprop;
PointerRNA ptr = but->rnapoin;
- float rgb[3];
+ float rgb[4];
if (&ptr && prop) {
RNA_property_float_get_array(&ptr, prop, rgb);
More information about the Bf-blender-cvs
mailing list