archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Fix T38516: crash when using color picker from redo panel.

Browse Source
This commit is contained in:
Brecht Van Lommel
2014-02-06 18:02:31 +01:00
parent 10b82471f4
commit e2541f87bc
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/editors/interface/interface.c
View File

@@ -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");

6
source/blender/editors/interface/interface_intern.h
View File

@@ -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 {