Commit: e2541f87bcef84481aabf19e15664cfdac452cf7
Author: Brecht Van Lommel
Date: Thu Feb 6 18:02:31 2014 +0100
https://developer.blender.org/rBe2541f87bcef84481aabf19e15664cfdac452cf7
Fix T38516: crash when using color picker from redo panel.
===================================================================
M source/blender/editors/interface/interface.c
M source/blender/editors/interface/interface_intern.h
===================================================================
diff --git a/source/blender/editors/interface/interface.c
b/source/blender/editors/interface/interface.c
index 6317cb8..6121a13 100644
--- a/source/blender/editors/interface/interface.c
+++ b/source/blender/editors/interface/interface.c
@@ -2299,7 +2299,7 @@ uiBlock *uiBeginBlock(const bContext *C, ARegion *region,
const char *name, shor
* would slow down redraw, so only lookup for actual transform
when it's indeed
* needed
*/
- block->display_device = scn->display_settings.display_device;
+ BLI_strncpy(block->display_device,
scn->display_settings.display_device, sizeof(block->display_device));
/* copy to avoid crash when scene gets deleted with ui still
open */
block->unit = MEM_mallocN(sizeof(scn->unit), "UI UnitSettings");
diff --git a/source/blender/editors/interface/interface_intern.h
b/source/blender/editors/interface/interface_intern.h
index 379ddc2..4a0864e 100644
--- a/source/blender/editors/interface/interface_intern.h
+++ b/source/blender/editors/interface/interface_intern.h
@@ -350,9 +350,9 @@ struct uiBlock {
bool color_profile; /* color profile for correcting linear
colors for display */
- const char *display_device; /* display device name used to display this
block,
- * used by color widgets to transform
colors from/to scene linear
- */
+ char display_device[64]; /* display device name used to display this
block,
+ * used by color widgets to transform colors
from/to scene linear
+ */
};
typedef struct uiSafetyRct {
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
