diff options
author | Campbell Barton <ideasman42@gmail.com> | 2019-02-27 02:46:48 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2019-02-27 03:03:16 +0300 |
commit | 3051e2f4ae8fd3e72a43dd1e5d40893d0efec500 (patch) | |
tree | 6de62ee531c71705a8d86592770d26f8ecb75d1f /source/blender/windowmanager | |
parent | ce104ca89643c4b0e6358fd22a2b056ecd603e62 (diff) |
DNA: rename Lamp -> Light
- BKE_lamp -> BKE_light
- Main.lamp -> light
Diffstat (limited to 'source/blender/windowmanager')
-rw-r--r-- | source/blender/windowmanager/WM_types.h | 2 | ||||
-rw-r--r-- | source/blender/windowmanager/intern/wm_operators.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/windowmanager/WM_types.h b/source/blender/windowmanager/WM_types.h index dc3b57e31f1..dd4fe95db3b 100644 --- a/source/blender/windowmanager/WM_types.h +++ b/source/blender/windowmanager/WM_types.h @@ -320,7 +320,7 @@ typedef struct wmNotifier { #define ND_SHADING_LINKS (32<<16) #define ND_SHADING_PREVIEW (33<<16) - /* NC_LAMP Lamp */ + /* NC_LAMP Light */ #define ND_LIGHTING (40<<16) #define ND_LIGHTING_DRAW (41<<16) #define ND_SKY (42<<16) diff --git a/source/blender/windowmanager/intern/wm_operators.c b/source/blender/windowmanager/intern/wm_operators.c index 3413b7ebab1..bafcdbf2139 100644 --- a/source/blender/windowmanager/intern/wm_operators.c +++ b/source/blender/windowmanager/intern/wm_operators.c @@ -2983,7 +2983,7 @@ static int previews_id_ensure_callback(void *userdata, ID *UNUSED(self_id), ID * static int previews_ensure_exec(bContext *C, wmOperator *UNUSED(op)) { Main *bmain = CTX_data_main(C); - ListBase *lb[] = {&bmain->mat, &bmain->tex, &bmain->image, &bmain->world, &bmain->lamp, NULL}; + ListBase *lb[] = {&bmain->mat, &bmain->tex, &bmain->image, &bmain->world, &bmain->light, NULL}; PreviewsIDEnsureData preview_id_data; Scene *scene; ID *id; @@ -3049,7 +3049,7 @@ static int previews_clear_exec(bContext *C, wmOperator *op) { Main *bmain = CTX_data_main(C); ListBase *lb[] = {&bmain->object, &bmain->collection, - &bmain->mat, &bmain->world, &bmain->lamp, &bmain->tex, &bmain->image, NULL}; + &bmain->mat, &bmain->world, &bmain->light, &bmain->tex, &bmain->image, NULL}; int i; const int id_filters = RNA_enum_get(op->ptr, "id_type"); |