Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/source
diff options
context:
space:
mode:
Diffstat (limited to 'source')
-rw-r--r--source/blender/editors/interface/interface.c2
-rw-r--r--source/blender/editors/interface/interface_intern.h6
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 {