diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2014-02-06 21:02:31 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2014-02-06 21:02:31 +0400 |
| commit | e2541f87bcef84481aabf19e15664cfdac452cf7 (patch) | |
| tree | e979575e47830457752772aea58cade40359133e /source | |
| parent | 10b82471f4bbe052506c6e0b1b7902cbdc0886c5 (diff) | |
Fix T38516: crash when using color picker from redo panel.
Diffstat (limited to 'source')
| -rw-r--r-- | source/blender/editors/interface/interface.c | 2 | ||||
| -rw-r--r-- | source/blender/editors/interface/interface_intern.h | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/editors/interface/interface.c b/source/blender/editors/interface/interface.c index 6317cb83a3a..6121a139761 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 379ddc27197..4a0864e22e7 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 { |