[Bf-blender-cvs] [83dc97ccc08] master: Cleanup: Use canonical variable name
Hans Goudey
noreply at git.blender.org
Fri Sep 25 22:55:29 CEST 2020
Commit: 83dc97ccc081f277f5dc197ea46c8e5b0ab45797
Author: Hans Goudey
Date: Fri Sep 25 15:54:25 2020 -0500
Branches: master
https://developer.blender.org/rB83dc97ccc081f277f5dc197ea46c8e5b0ab45797
Cleanup: Use canonical variable name
===================================================================
M source/blender/editors/interface/interface.c
===================================================================
diff --git a/source/blender/editors/interface/interface.c b/source/blender/editors/interface/interface.c
index bdc00b985bc..a5b7a011e6b 100644
--- a/source/blender/editors/interface/interface.c
+++ b/source/blender/editors/interface/interface.c
@@ -3468,24 +3468,24 @@ void UI_block_region_set(uiBlock *block, ARegion *region)
uiBlock *UI_block_begin(const bContext *C, ARegion *region, const char *name, char emboss)
{
wmWindow *window = CTX_wm_window(C);
- Scene *scn = CTX_data_scene(C);
+ Scene *scene = CTX_data_scene(C);
uiBlock *block = MEM_callocN(sizeof(uiBlock), "uiBlock");
block->active = 1;
block->emboss = emboss;
block->evil_C = (void *)C; /* XXX */
- if (scn) {
+ if (scene) {
/* store display device name, don't lookup for transformations yet
* block could be used for non-color displays where looking up for transformation
* would slow down redraw, so only lookup for actual transform when it's indeed
* needed
*/
- STRNCPY(block->display_device, scn->display_settings.display_device);
+ STRNCPY(block->display_device, scene->display_settings.display_device);
/* copy to avoid crash when scene gets deleted with ui still open */
- block->unit = MEM_mallocN(sizeof(scn->unit), "UI UnitSettings");
- memcpy(block->unit, &scn->unit, sizeof(scn->unit));
+ block->unit = MEM_mallocN(sizeof(scene->unit), "UI UnitSettings");
+ memcpy(block->unit, &scene->unit, sizeof(scene->unit));
}
else {
STRNCPY(block->display_device, IMB_colormanagement_display_get_default_name());
More information about the Bf-blender-cvs
mailing list