diff options
author | Campbell Barton <ideasman42@gmail.com> | 2019-02-27 04:34:56 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2019-02-27 04:36:32 +0300 |
commit | 168d3fd528c419b1f877362ef9ffecfc8c790a8a (patch) | |
tree | 91df8996559512c6abb532f53c1c2c869cf686d9 /source/blender | |
parent | 1079742db92576d79ec89a28d95336aff847a82a (diff) |
Cleanup: file rename lamp -> light
Diffstat (limited to 'source/blender')
70 files changed, 81 insertions, 81 deletions
diff --git a/source/blender/CMakeLists.txt b/source/blender/CMakeLists.txt index c51e0b5b01c..7b21e879729 100644 --- a/source/blender/CMakeLists.txt +++ b/source/blender/CMakeLists.txt @@ -46,9 +46,9 @@ set(SRC_DNA_INC ${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_image_types.h ${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_ipo_types.h ${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_key_types.h - ${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_lamp_types.h ${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_lattice_types.h ${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_layer_types.h + ${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_light_types.h ${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_lightprobe_types.h ${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_linestyle_types.h ${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_listBase.h diff --git a/source/blender/blenkernel/BKE_lamp.h b/source/blender/blenkernel/BKE_light.h index 7625d5db9e4..7625d5db9e4 100644 --- a/source/blender/blenkernel/BKE_lamp.h +++ b/source/blender/blenkernel/BKE_light.h diff --git a/source/blender/blenkernel/BKE_node.h b/source/blender/blenkernel/BKE_node.h index 7e924ded048..6e6ec31aa6a 100644 --- a/source/blender/blenkernel/BKE_node.h +++ b/source/blender/blenkernel/BKE_node.h @@ -30,7 +30,7 @@ #include "DNA_listBase.h" /* for FOREACH_NODETREE_BEGIN */ -#include "DNA_lamp_types.h" +#include "DNA_light_types.h" #include "DNA_material_types.h" #include "DNA_node_types.h" #include "DNA_scene_types.h" diff --git a/source/blender/blenkernel/CMakeLists.txt b/source/blender/blenkernel/CMakeLists.txt index e3afbc507bf..c882be972f5 100644 --- a/source/blender/blenkernel/CMakeLists.txt +++ b/source/blender/blenkernel/CMakeLists.txt @@ -124,7 +124,6 @@ set(SRC intern/ipo.c intern/key.c intern/keyconfig.c - intern/lamp.c intern/lattice.c intern/layer.c intern/layer_utils.c @@ -133,6 +132,7 @@ set(SRC intern/library_override.c intern/library_query.c intern/library_remap.c + intern/light.c intern/lightprobe.c intern/linestyle.c intern/main.c @@ -278,7 +278,6 @@ set(SRC BKE_ipo.h BKE_key.h BKE_keyconfig.h - BKE_lamp.h BKE_lattice.h BKE_layer.h BKE_library.h @@ -286,6 +285,7 @@ set(SRC BKE_library_override.h BKE_library_query.h BKE_library_remap.h + BKE_light.h BKE_lightprobe.h BKE_linestyle.h BKE_main.h diff --git a/source/blender/blenkernel/intern/anim_sys.c b/source/blender/blenkernel/intern/anim_sys.c index 3cbc81e887a..acbf0068a57 100644 --- a/source/blender/blenkernel/intern/anim_sys.c +++ b/source/blender/blenkernel/intern/anim_sys.c @@ -42,7 +42,7 @@ #include "BLT_translation.h" #include "DNA_anim_types.h" -#include "DNA_lamp_types.h" +#include "DNA_light_types.h" #include "DNA_material_types.h" #include "DNA_object_types.h" #include "DNA_scene_types.h" diff --git a/source/blender/blenkernel/intern/camera.c b/source/blender/blenkernel/intern/camera.c index ce80aac5596..cfcf5eeed96 100644 --- a/source/blender/blenkernel/intern/camera.c +++ b/source/blender/blenkernel/intern/camera.c @@ -25,7 +25,7 @@ #include <stddef.h> #include "DNA_camera_types.h" -#include "DNA_lamp_types.h" +#include "DNA_light_types.h" #include "DNA_object_types.h" #include "DNA_scene_types.h" #include "DNA_view3d_types.h" diff --git a/source/blender/blenkernel/intern/icons.c b/source/blender/blenkernel/intern/icons.c index 24d548c18c6..bad1e6620eb 100644 --- a/source/blender/blenkernel/intern/icons.c +++ b/source/blender/blenkernel/intern/icons.c @@ -33,7 +33,7 @@ #include "DNA_brush_types.h" #include "DNA_collection_types.h" #include "DNA_gpencil_types.h" -#include "DNA_lamp_types.h" +#include "DNA_light_types.h" #include "DNA_material_types.h" #include "DNA_object_types.h" #include "DNA_scene_types.h" diff --git a/source/blender/blenkernel/intern/ipo.c b/source/blender/blenkernel/intern/ipo.c index 1813edbafb4..356271d82bd 100644 --- a/source/blender/blenkernel/intern/ipo.c +++ b/source/blender/blenkernel/intern/ipo.c @@ -41,7 +41,7 @@ #include "DNA_anim_types.h" #include "DNA_constraint_types.h" #include "DNA_camera_types.h" -#include "DNA_lamp_types.h" +#include "DNA_light_types.h" #include "DNA_ipo_types.h" #include "DNA_key_types.h" #include "DNA_material_types.h" diff --git a/source/blender/blenkernel/intern/library.c b/source/blender/blenkernel/intern/library.c index 5ff1418cf6a..68dcbd48428 100644 --- a/source/blender/blenkernel/intern/library.c +++ b/source/blender/blenkernel/intern/library.c @@ -45,7 +45,7 @@ #include "DNA_gpencil_types.h" #include "DNA_ipo_types.h" #include "DNA_key_types.h" -#include "DNA_lamp_types.h" +#include "DNA_light_types.h" #include "DNA_lattice_types.h" #include "DNA_linestyle_types.h" #include "DNA_material_types.h" @@ -93,7 +93,7 @@ #include "BKE_idprop.h" #include "BKE_image.h" #include "BKE_key.h" -#include "BKE_lamp.h" +#include "BKE_light.h" #include "BKE_lattice.h" #include "BKE_library.h" #include "BKE_library_query.h" diff --git a/source/blender/blenkernel/intern/library_query.c b/source/blender/blenkernel/intern/library_query.c index 65bece54306..e30dd9cdf5e 100644 --- a/source/blender/blenkernel/intern/library_query.c +++ b/source/blender/blenkernel/intern/library_query.c @@ -33,7 +33,7 @@ #include "DNA_constraint_types.h" #include "DNA_gpencil_types.h" #include "DNA_key_types.h" -#include "DNA_lamp_types.h" +#include "DNA_light_types.h" #include "DNA_lattice_types.h" #include "DNA_linestyle_types.h" #include "DNA_material_types.h" diff --git a/source/blender/blenkernel/intern/library_remap.c b/source/blender/blenkernel/intern/library_remap.c index a5fdcfcb0f2..e965e2a6aac 100644 --- a/source/blender/blenkernel/intern/library_remap.c +++ b/source/blender/blenkernel/intern/library_remap.c @@ -41,7 +41,7 @@ #include "DNA_gpencil_types.h" #include "DNA_ipo_types.h" #include "DNA_key_types.h" -#include "DNA_lamp_types.h" +#include "DNA_light_types.h" #include "DNA_lattice_types.h" #include "DNA_linestyle_types.h" #include "DNA_material_types.h" @@ -80,7 +80,7 @@ #include "BKE_image.h" #include "BKE_ipo.h" #include "BKE_key.h" -#include "BKE_lamp.h" +#include "BKE_light.h" #include "BKE_lattice.h" #include "BKE_layer.h" #include "BKE_library.h" diff --git a/source/blender/blenkernel/intern/lamp.c b/source/blender/blenkernel/intern/light.c index 318f5e7a046..b1ec5ba6954 100644 --- a/source/blender/blenkernel/intern/lamp.c +++ b/source/blender/blenkernel/intern/light.c @@ -26,7 +26,7 @@ #include "MEM_guardedalloc.h" #include "DNA_anim_types.h" -#include "DNA_lamp_types.h" +#include "DNA_light_types.h" #include "DNA_material_types.h" #include "DNA_node_types.h" #include "DNA_object_types.h" @@ -39,7 +39,7 @@ #include "BKE_animsys.h" #include "BKE_colortools.h" #include "BKE_icons.h" -#include "BKE_lamp.h" +#include "BKE_light.h" #include "BKE_library.h" #include "BKE_main.h" #include "BKE_node.h" diff --git a/source/blender/blenkernel/intern/node.c b/source/blender/blenkernel/intern/node.c index 83c9697ae1e..4585c343d95 100644 --- a/source/blender/blenkernel/intern/node.c +++ b/source/blender/blenkernel/intern/node.c @@ -32,7 +32,7 @@ #include "DNA_action_types.h" #include "DNA_anim_types.h" -#include "DNA_lamp_types.h" +#include "DNA_light_types.h" #include "DNA_material_types.h" #include "DNA_node_types.h" #include "DNA_scene_types.h" diff --git a/source/blender/blenkernel/intern/object.c b/source/blender/blenkernel/intern/object.c index 460c50d0d0b..1b4aad16778 100644 --- a/source/blender/blenkernel/intern/object.c +++ b/source/blender/blenkernel/intern/object.c @@ -38,7 +38,7 @@ #include "DNA_gpencil_types.h" #include "DNA_gpencil_modifier_types.h" #include "DNA_key_types.h" -#include "DNA_lamp_types.h" +#include "DNA_light_types.h" #include "DNA_lattice_types.h" #include "DNA_material_types.h" #include "DNA_meta_types.h" @@ -85,7 +85,7 @@ #include "BKE_gpencil_modifier.h" #include "BKE_icons.h" #include "BKE_key.h" -#include "BKE_lamp.h" +#include "BKE_light.h" #include "BKE_layer.h" #include "BKE_lattice.h" #include "BKE_library.h" diff --git a/source/blender/blenkernel/intern/object_update.c b/source/blender/blenkernel/intern/object_update.c index 955f2f905d3..dd0b5668c25 100644 --- a/source/blender/blenkernel/intern/object_update.c +++ b/source/blender/blenkernel/intern/object_update.c @@ -44,7 +44,7 @@ #include "BKE_effect.h" #include "BKE_image.h" #include "BKE_key.h" -#include "BKE_lamp.h" +#include "BKE_light.h" #include "BKE_lattice.h" #include "BKE_material.h" #include "BKE_mball.h" diff --git a/source/blender/blenkernel/intern/smoke.c b/source/blender/blenkernel/intern/smoke.c index d7ff640bce8..4b9dd9ac6e3 100644 --- a/source/blender/blenkernel/intern/smoke.c +++ b/source/blender/blenkernel/intern/smoke.c @@ -41,7 +41,7 @@ #include "DNA_armature_types.h" #include "DNA_constraint_types.h" #include "DNA_customdata_types.h" -#include "DNA_lamp_types.h" +#include "DNA_light_types.h" #include "DNA_mesh_types.h" #include "DNA_meshdata_types.h" #include "DNA_modifier_types.h" diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c index 74aadc00f93..2472e900e80 100644 --- a/source/blender/blenloader/intern/readfile.c +++ b/source/blender/blenloader/intern/readfile.c @@ -69,7 +69,7 @@ #include "DNA_key_types.h" #include "DNA_lattice_types.h" #include "DNA_layer_types.h" -#include "DNA_lamp_types.h" +#include "DNA_light_types.h" #include "DNA_linestyle_types.h" #include "DNA_meta_types.h" #include "DNA_material_types.h" diff --git a/source/blender/blenloader/intern/versioning_250.c b/source/blender/blenloader/intern/versioning_250.c index 1a92a75af09..e894ef45b40 100644 --- a/source/blender/blenloader/intern/versioning_250.c +++ b/source/blender/blenloader/intern/versioning_250.c @@ -39,7 +39,7 @@ #include "DNA_ipo_types.h" #include "DNA_key_types.h" #include "DNA_lattice_types.h" -#include "DNA_lamp_types.h" +#include "DNA_light_types.h" #include "DNA_material_types.h" #include "DNA_mesh_types.h" #include "DNA_meshdata_types.h" diff --git a/source/blender/blenloader/intern/versioning_280.c b/source/blender/blenloader/intern/versioning_280.c index f77d3207661..89525cdde21 100644 --- a/source/blender/blenloader/intern/versioning_280.c +++ b/source/blender/blenloader/intern/versioning_280.c @@ -36,7 +36,7 @@ #include "DNA_collection_types.h" #include "DNA_constraint_types.h" #include "DNA_gpu_types.h" -#include "DNA_lamp_types.h" +#include "DNA_light_types.h" #include "DNA_layer_types.h" #include "DNA_lightprobe_types.h" #include "DNA_material_types.h" diff --git a/source/blender/blenloader/intern/versioning_legacy.c b/source/blender/blenloader/intern/versioning_legacy.c index d2aab2bf97b..cacd7e5720f 100644 --- a/source/blender/blenloader/intern/versioning_legacy.c +++ b/source/blender/blenloader/intern/versioning_legacy.c @@ -43,7 +43,7 @@ #include "DNA_effect_types.h" #include "DNA_key_types.h" #include "DNA_lattice_types.h" -#include "DNA_lamp_types.h" +#include "DNA_light_types.h" #include "DNA_material_types.h" #include "DNA_mesh_types.h" #include "DNA_meshdata_types.h" diff --git a/source/blender/blenloader/intern/writefile.c b/source/blender/blenloader/intern/writefile.c index 42a39ddeca9..235f9b2a799 100644 --- a/source/blender/blenloader/intern/writefile.c +++ b/source/blender/blenloader/intern/writefile.c @@ -114,7 +114,7 @@ #include "DNA_fileglobal_types.h" #include "DNA_key_types.h" #include "DNA_lattice_types.h" -#include "DNA_lamp_types.h" +#include "DNA_light_types.h" #include "DNA_layer_types.h" #include "DNA_linestyle_types.h" #include "DNA_meta_types.h" diff --git a/source/blender/collada/AnimationExporter.h b/source/blender/collada/AnimationExporter.h index 700f9f510a2..295ec66a4e8 100644 --- a/source/blender/collada/AnimationExporter.h +++ b/source/blender/collada/AnimationExporter.h @@ -30,7 +30,7 @@ extern "C" #include "DNA_anim_types.h" #include "DNA_action_types.h" #include "DNA_curve_types.h" -#include "DNA_lamp_types.h" +#include "DNA_light_types.h" #include "DNA_camera_types.h" #include "DNA_armature_types.h" #include "DNA_material_types.h" diff --git a/source/blender/collada/AnimationImporter.h b/source/blender/collada/AnimationImporter.h index f8e6c6ce1d8..e5d431a05c0 100644 --- a/source/blender/collada/AnimationImporter.h +++ b/source/blender/collada/AnimationImporter.h @@ -40,7 +40,7 @@ extern "C" { #include "DNA_anim_types.h" #include "DNA_object_types.h" #include "DNA_scene_types.h" -#include "DNA_lamp_types.h" +#include "DNA_light_types.h" #include "DNA_camera_types.h" } diff --git a/source/blender/collada/BCSampleData.h b/source/blender/collada/BCSampleData.h index affc338518e..ec7f14f8c3a 100644 --- a/source/blender/collada/BCSampleData.h +++ b/source/blender/collada/BCSampleData.h @@ -31,7 +31,7 @@ extern "C" #include "DNA_object_types.h" #include "DNA_armature_types.h" #include "DNA_material_types.h" -#include "DNA_lamp_types.h" +#include "DNA_light_types.h" #include "DNA_camera_types.h" } diff --git a/source/blender/collada/DocumentImporter.cpp b/source/blender/collada/DocumentImporter.cpp index a81fa6c5c31..97d4f056d0b 100644 --- a/source/blender/collada/DocumentImporter.cpp +++ b/source/blender/collada/DocumentImporter.cpp @@ -56,7 +56,7 @@ extern "C" { #include "BKE_global.h" #include "BKE_image.h" #include "BKE_layer.h" -#include "BKE_lamp.h" +#include "BKE_light.h" #include "BKE_library.h" #include "BKE_material.h" #include "BKE_scene.h" @@ -64,7 +64,7 @@ extern "C" { #include "BLI_path_util.h" #include "DNA_camera_types.h" -#include "DNA_lamp_types.h" +#include "DNA_light_types.h" #include "RNA_access.h" diff --git a/source/blender/collada/LightExporter.h b/source/blender/collada/LightExporter.h index 3e5decfdbd8..7cd0d2979e5 100644 --- a/source/blender/collada/LightExporter.h +++ b/source/blender/collada/LightExporter.h @@ -24,7 +24,7 @@ #include "COLLADASWStreamWriter.h" #include "COLLADASWLibraryLights.h" -#include "DNA_lamp_types.h" +#include "DNA_light_types.h" #include "DNA_object_types.h" #include "DNA_scene_types.h" diff --git a/source/blender/collada/collada_utils.h b/source/blender/collada/collada_utils.h index 9eeedb230e6..32c89cf41e6 100644 --- a/source/blender/collada/collada_utils.h +++ b/source/blender/collada/collada_utils.h @@ -39,7 +39,7 @@ extern "C" { #include "DNA_anim_types.h" #include "DNA_constraint_types.h" #include "DNA_mesh_types.h" -#include "DNA_lamp_types.h" +#include "DNA_light_types.h" #include "DNA_camera_types.h" #include "DNA_customdata_types.h" diff --git a/source/blender/compositor/operations/COM_GlareThresholdOperation.h b/source/blender/compositor/operations/COM_GlareThresholdOperation.h index 63e61cbfa97..2a38783511f 100644 --- a/source/blender/compositor/operations/COM_GlareThresholdOperation.h +++ b/source/blender/compositor/operations/COM_GlareThresholdOperation.h @@ -19,7 +19,7 @@ #ifndef __COM_GLARETHRESHOLDOPERATION_H__ #define __COM_GLARETHRESHOLDOPERATION_H__ #include "COM_NodeOperation.h" -#include "DNA_lamp_types.h" +#include "DNA_light_types.h" class GlareThresholdOperation : public NodeOperation { private: diff --git a/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc b/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc index 25f1af9c620..0fe4afd7b55 100644 --- a/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc +++ b/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc @@ -46,7 +46,7 @@ extern "C" { #include "DNA_effect_types.h" #include "DNA_gpencil_types.h" #include "DNA_key_types.h" -#include "DNA_lamp_types.h" +#include "DNA_light_types.h" #include "DNA_material_types.h" #include "DNA_mask_types.h" #include "DNA_mesh_types.h" diff --git a/source/blender/depsgraph/intern/builder/deg_builder_relations.cc b/source/blender/depsgraph/intern/builder/deg_builder_relations.cc index 2a9f81b8495..99334c81db5 100644 --- a/source/blender/depsgraph/intern/builder/deg_builder_relations.cc +++ b/source/blender/depsgraph/intern/builder/deg_builder_relations.cc @@ -46,7 +46,7 @@ extern "C" { #include "DNA_effect_types.h" #include "DNA_gpencil_types.h" #include "DNA_key_types.h" -#include "DNA_lamp_types.h" +#include "DNA_light_types.h" #include "DNA_material_types.h" #include "DNA_mask_types.h" #include "DNA_mesh_types.h" diff --git a/source/blender/depsgraph/intern/eval/deg_eval_copy_on_write.cc b/source/blender/depsgraph/intern/eval/deg_eval_copy_on_write.cc index 0882b98ef07..bd713058cce 100644 --- a/source/blender/depsgraph/intern/eval/deg_eval_copy_on_write.cc +++ b/source/blender/depsgraph/intern/eval/deg_eval_copy_on_write.cc @@ -69,7 +69,7 @@ extern "C" { #ifdef NESTED_ID_NASTY_WORKAROUND # include "DNA_curve_types.h" # include "DNA_key_types.h" -# include "DNA_lamp_types.h" +# include "DNA_light_types.h" # include "DNA_lattice_types.h" # include "DNA_linestyle_types.h" # include "DNA_material_types.h" diff --git a/source/blender/draw/CMakeLists.txt b/source/blender/draw/CMakeLists.txt index 80878ae9246..aea08f87a84 100644 --- a/source/blender/draw/CMakeLists.txt +++ b/source/blender/draw/CMakeLists.txt @@ -156,7 +156,7 @@ data_to_c_simple(engines/eevee/shaders/default_world_frag.glsl SRC) data_to_c_simple(engines/eevee/shaders/background_vert.glsl SRC) data_to_c_simple(engines/eevee/shaders/concentric_samples_lib.glsl SRC) data_to_c_simple(engines/eevee/shaders/common_uniforms_lib.glsl SRC) -data_to_c_simple(engines/eevee/shaders/lamps_lib.glsl SRC) +data_to_c_simple(engines/eevee/shaders/lights_lib.glsl SRC) data_to_c_simple(engines/eevee/shaders/lightprobe_lib.glsl SRC) data_to_c_simple(engines/eevee/shaders/lightprobe_filter_glossy_frag.glsl SRC) data_to_c_simple(engines/eevee/shaders/lightprobe_filter_diffuse_frag.glsl SRC) diff --git a/source/blender/draw/engines/eevee/eevee_materials.c b/source/blender/draw/engines/eevee/eevee_materials.c index eec61ffd08c..5a808f2a01f 100644 --- a/source/blender/draw/engines/eevee/eevee_materials.c +++ b/source/blender/draw/engines/eevee/eevee_materials.c @@ -70,7 +70,7 @@ static struct { float noise_offsets[3]; } e_data = {NULL}; /* Engine data */ -extern char datatoc_lamps_lib_glsl[]; +extern char datatoc_lights_lib_glsl[]; extern char datatoc_lightprobe_lib_glsl[]; extern char datatoc_ambient_occlusion_lib_glsl[]; extern char datatoc_prepass_frag_glsl[]; @@ -553,7 +553,7 @@ void EEVEE_materials_init(EEVEE_ViewLayerData *sldata, EEVEE_StorageList *stl, E datatoc_irradiance_lib_glsl, datatoc_lightprobe_lib_glsl, datatoc_ltc_lib_glsl, - datatoc_lamps_lib_glsl, + datatoc_lights_lib_glsl, /* Add one for each Closure */ datatoc_lit_surface_frag_glsl, datatoc_lit_surface_frag_glsl, @@ -576,7 +576,7 @@ void EEVEE_materials_init(EEVEE_ViewLayerData *sldata, EEVEE_StorageList *stl, E datatoc_irradiance_lib_glsl, datatoc_lightprobe_lib_glsl, datatoc_ltc_lib_glsl, - datatoc_lamps_lib_glsl, + datatoc_lights_lib_glsl, datatoc_volumetric_lib_glsl, datatoc_volumetric_frag_glsl); diff --git a/source/blender/draw/engines/eevee/eevee_volumes.c b/source/blender/draw/engines/eevee/eevee_volumes.c index 53c08c4d8f3..cf12863565f 100644 --- a/source/blender/draw/engines/eevee/eevee_volumes.c +++ b/source/blender/draw/engines/eevee/eevee_volumes.c @@ -66,7 +66,7 @@ extern char datatoc_common_uniforms_lib_glsl[]; extern char datatoc_common_view_lib_glsl[]; extern char datatoc_octahedron_lib_glsl[]; extern char datatoc_irradiance_lib_glsl[]; -extern char datatoc_lamps_lib_glsl[]; +extern char datatoc_lights_lib_glsl[]; extern char datatoc_volumetric_frag_glsl[]; extern char datatoc_volumetric_geom_glsl[]; extern char datatoc_volumetric_vert_glsl[]; @@ -90,7 +90,7 @@ static void eevee_create_shader_volumes(void) datatoc_bsdf_common_lib_glsl, datatoc_octahedron_lib_glsl, datatoc_irradiance_lib_glsl, - datatoc_lamps_lib_glsl, + datatoc_lights_lib_glsl, datatoc_volumetric_lib_glsl); e_data.volumetric_clear_sh = DRW_shader_create_with_lib( diff --git a/source/blender/draw/engines/eevee/shaders/lamps_lib.glsl b/source/blender/draw/engines/eevee/shaders/lights_lib.glsl index e12d76596d3..e12d76596d3 100644 --- a/source/blender/draw/engines/eevee/shaders/lamps_lib.glsl +++ b/source/blender/draw/engines/eevee/shaders/lights_lib.glsl diff --git a/source/blender/draw/intern/DRW_render.h b/source/blender/draw/intern/DRW_render.h index 8d5518a6b99..d79b7caf5e7 100644 --- a/source/blender/draw/intern/DRW_render.h +++ b/source/blender/draw/intern/DRW_render.h @@ -38,7 +38,7 @@ #include "BLT_translation.h" #include "DNA_object_types.h" -#include "DNA_lamp_types.h" +#include "DNA_light_types.h" #include "DNA_material_types.h" #include "DNA_scene_types.h" #include "DNA_world_types.h" diff --git a/source/blender/editors/animation/anim_channels_defines.c b/source/blender/editors/animation/anim_channels_defines.c index 22e1c75c00e..29ae22cd306 100644 --- a/source/blender/editors/animation/anim_channels_defines.c +++ b/source/blender/editors/animation/anim_channels_defines.c @@ -42,7 +42,7 @@ #include "DNA_scene_types.h" #include "DNA_space_types.h" #include "DNA_key_types.h" -#include "DNA_lamp_types.h" +#include "DNA_light_types.h" #include "DNA_lattice_types.h" #include "DNA_linestyle_types.h" #include "DNA_mesh_types.h" diff --git a/source/blender/editors/animation/anim_filter.c b/source/blender/editors/animation/anim_filter.c index c29a2f403c9..5a0deaddb35 100644 --- a/source/blender/editors/animation/anim_filter.c +++ b/source/blender/editors/animation/anim_filter.c @@ -47,7 +47,7 @@ #include "DNA_armature_types.h" #include "DNA_camera_types.h" #include "DNA_cachefile_types.h" -#include "DNA_lamp_types.h" +#include "DNA_light_types.h" #include "DNA_lattice_types.h" #include "DNA_linestyle_types.h" #include "DNA_key_types.h" diff --git a/source/blender/editors/interface/interface_templates.c b/source/blender/editors/interface/interface_templates.c index 3159177e624..0d7dbd0d441 100644 --- a/source/blender/editors/interface/interface_templates.c +++ b/source/blender/editors/interface/interface_templates.c @@ -2144,7 +2144,7 @@ uiLayout *uiTemplateConstraint(uiLayout *layout, PointerRNA *ptr) /************************* Preview Template ***************************/ -#include "DNA_lamp_types.h" +#include "DNA_light_types.h" #include "DNA_material_types.h" #include "DNA_world_types.h" diff --git a/source/blender/editors/object/object_add.c b/source/blender/editors/object/object_add.c index 61853f05f46..b95aa6c787a 100644 --- a/source/blender/editors/object/object_add.c +++ b/source/blender/editors/object/object_add.c @@ -32,7 +32,7 @@ #include "DNA_camera_types.h" #include "DNA_collection_types.h" #include "DNA_curve_types.h" -#include "DNA_lamp_types.h" +#include "DNA_light_types.h" #include "DNA_key_types.h" #include "DNA_material_types.h" #include "DNA_mesh_types.h" @@ -67,7 +67,7 @@ #include "BKE_font.h" #include "BKE_gpencil.h" #include "BKE_key.h" -#include "BKE_lamp.h" +#include "BKE_light.h" #include "BKE_lattice.h" #include "BKE_layer.h" #include "BKE_library.h" @@ -114,7 +114,7 @@ #include "object_intern.h" -/* this is an exact copy of the define in rna_lamp.c +/* this is an exact copy of the define in rna_light.c * kept here because of linking order. * Icons are only defined here */ const EnumPropertyItem rna_enum_light_type_items[] = { diff --git a/source/blender/editors/object/object_relations.c b/source/blender/editors/object/object_relations.c index de17b3ca281..4d6864d2023 100644 --- a/source/blender/editors/object/object_relations.c +++ b/source/blender/editors/object/object_relations.c @@ -33,7 +33,7 @@ #include "DNA_mesh_types.h" #include "DNA_collection_types.h" #include "DNA_constraint_types.h" -#include "DNA_lamp_types.h" +#include "DNA_light_types.h" #include "DNA_lattice_types.h" #include "DNA_material_types.h" #include "DNA_meta_types.h" @@ -67,7 +67,7 @@ #include "BKE_gpencil.h" #include "BKE_fcurve.h" #include "BKE_idprop.h" -#include "BKE_lamp.h" +#include "BKE_light.h" #include "BKE_lattice.h" #include "BKE_layer.h" #include "BKE_library.h" diff --git a/source/blender/editors/object/object_select.c b/source/blender/editors/object/object_select.c index f06343abcae..96dc18b41f0 100644 --- a/source/blender/editors/object/object_select.c +++ b/source/blender/editors/object/object_select.c @@ -33,7 +33,7 @@ #include "DNA_modifier_types.h" #include "DNA_scene_types.h" #include "DNA_armature_types.h" -#include "DNA_lamp_types.h" +#include "DNA_light_types.h" #include "DNA_workspace_types.h" #include "DNA_gpencil_types.h" diff --git a/source/blender/editors/object/object_transform.c b/source/blender/editors/object/object_transform.c index ebc6f35e43e..ea51fdb5c86 100644 --- a/source/blender/editors/object/object_transform.c +++ b/source/blender/editors/object/object_transform.c @@ -29,7 +29,7 @@ #include "DNA_armature_types.h" #include "DNA_mesh_types.h" #include "DNA_meta_types.h" -#include "DNA_lamp_types.h" +#include "DNA_light_types.h" #include "DNA_object_types.h" #include "DNA_scene_types.h" #include "DNA_gpencil_types.h" diff --git a/source/blender/editors/render/render_preview.c b/source/blender/editors/render/render_preview.c index 53c9f428196..5ea63901085 100644 --- a/source/blender/editors/render/render_preview.c +++ b/source/blender/editors/render/render_preview.c @@ -47,7 +47,7 @@ #include "DNA_material_types.h" #include "DNA_node_types.h" #include "DNA_object_types.h" -#include "DNA_lamp_types.h" +#include "DNA_light_types.h" #include "DNA_space_types.h" #include "DNA_scene_types.h" #include "DNA_brush_types.h" @@ -61,7 +61,7 @@ #include "BKE_idprop.h" #include "BKE_image.h" #include "BKE_icons.h" -#include "BKE_lamp.h" +#include "BKE_light.h" #include "BKE_layer.h" #include "BKE_main.h" #include "BKE_material.h" diff --git a/source/blender/editors/render/render_shading.c b/source/blender/editors/render/render_shading.c index 1afe0763699..d1bed15872d 100644 --- a/source/blender/editors/render/render_shading.c +++ b/source/blender/editors/render/render_shading.c @@ -26,7 +26,7 @@ #include "MEM_guardedalloc.h" #include "DNA_curve_types.h" -#include "DNA_lamp_types.h" +#include "DNA_light_types.h" #include "DNA_lightprobe_types.h" #include "DNA_material_types.h" #include "DNA_node_types.h" diff --git a/source/blender/editors/render/render_update.c b/source/blender/editors/render/render_update.c index 6dd2d345726..462fd997fc5 100644 --- a/source/blender/editors/render/render_update.c +++ b/source/blender/editors/render/render_update.c @@ -23,7 +23,7 @@ #include <stdlib.h> #include <string.h> -#include "DNA_lamp_types.h" +#include "DNA_light_types.h" #include "DNA_material_types.h" #include "DNA_meshdata_types.h" #include "DNA_node_types.h" diff --git a/source/blender/editors/space_buttons/buttons_context.c b/source/blender/editors/space_buttons/buttons_context.c index 97b4578d951..10c0a6f4a57 100644 --- a/source/blender/editors/space_buttons/buttons_context.c +++ b/source/blender/editors/space_buttons/buttons_context.c @@ -34,7 +34,7 @@ #include "DNA_armature_types.h" #include "DNA_collection_types.h" -#include "DNA_lamp_types.h" +#include "DNA_light_types.h" #include "DNA_material_types.h" #include "DNA_node_types.h" #include "DNA_scene_types.h" diff --git a/source/blender/editors/space_node/node_draw.c b/source/blender/editors/space_node/node_draw.c index ffc9ba54c99..0a33e5ebf12 100644 --- a/source/blender/editors/space_node/node_draw.c +++ b/source/blender/editors/space_node/node_draw.c @@ -22,7 +22,7 @@ * \brief higher level node drawing for the node editor. */ -#include "DNA_lamp_types.h" +#include "DNA_light_types.h" #include "DNA_node_types.h" #include "DNA_material_types.h" #include "DNA_screen_types.h" diff --git a/source/blender/editors/space_node/node_edit.c b/source/blender/editors/space_node/node_edit.c index 6347548cd7e..038ab62af78 100644 --- a/source/blender/editors/space_node/node_edit.c +++ b/source/blender/editors/space_node/node_edit.c @@ -23,7 +23,7 @@ #include "MEM_guardedalloc.h" -#include "DNA_lamp_types.h" +#include "DNA_light_types.h" #include "DNA_material_types.h" #include "DNA_node_types.h" #include "DNA_text_types.h" diff --git a/source/blender/editors/space_node/space_node.c b/source/blender/editors/space_node/space_node.c index b94a27b7839..fc8d880080d 100644 --- a/source/blender/editors/space_node/space_node.c +++ b/source/blender/editors/space_node/space_node.c @@ -22,7 +22,7 @@ */ #include "DNA_gpencil_types.h" -#include "DNA_lamp_types.h" +#include "DNA_light_types.h" #include "DNA_material_types.h" #include "DNA_node_types.h" #include "DNA_world_types.h" diff --git a/source/blender/editors/space_outliner/outliner_draw.c b/source/blender/editors/space_outliner/outliner_draw.c index ff6def955ce..ba6a2d9f318 100644 --- a/source/blender/editors/space_outliner/outliner_draw.c +++ b/source/blender/editors/space_outliner/outliner_draw.c @@ -26,7 +26,7 @@ #include "DNA_collection_types.h" #include "DNA_gpencil_types.h" #include "DNA_gpencil_modifier_types.h" -#include "DNA_lamp_types.h" +#include "DNA_light_types.h" #include "DNA_lightprobe_types.h" #include "DNA_object_types.h" #include "DNA_scene_types.h" diff --git a/source/blender/editors/space_outliner/outliner_select.c b/source/blender/editors/space_outliner/outliner_select.c index 131701e8bcb..1f59658b8ab 100644 --- a/source/blender/editors/space_outliner/outliner_select.c +++ b/source/blender/editors/space_outliner/outliner_select.c @@ -25,7 +25,7 @@ #include "DNA_armature_types.h" #include "DNA_collection_types.h" -#include "DNA_lamp_types.h" +#include "DNA_light_types.h" #include "DNA_material_types.h" #include "DNA_object_types.h" #include "DNA_scene_types.h" diff --git a/source/blender/editors/space_outliner/outliner_tools.c b/source/blender/editors/space_outliner/outliner_tools.c index b1911895bf2..8aa8eb04954 100644 --- a/source/blender/editors/space_outliner/outliner_tools.c +++ b/source/blender/editors/space_outliner/outliner_tools.c @@ -27,7 +27,7 @@ #include "DNA_armature_types.h" #include "DNA_collection_types.h" #include "DNA_gpencil_types.h" -#include "DNA_lamp_types.h" +#include "DNA_light_types.h" #include "DNA_linestyle_types.h" #include "DNA_material_types.h" #include "DNA_mesh_types.h" diff --git a/source/blender/editors/space_outliner/outliner_tree.c b/source/blender/editors/space_outliner/outliner_tree.c index 09176e08621..f98913c34ed 100644 --- a/source/blender/editors/space_outliner/outliner_tree.c +++ b/source/blender/editors/space_outliner/outliner_tree.c @@ -34,7 +34,7 @@ #include "DNA_collection_types.h" #include "DNA_gpencil_types.h" #include "DNA_key_types.h" -#include "DNA_lamp_types.h" +#include "DNA_light_types.h" #include "DNA_material_types.h" #include "DNA_mesh_types.h" #include "DNA_meta_types.h" diff --git a/source/blender/editors/space_view3d/CMakeLists.txt b/source/blender/editors/space_view3d/CMakeLists.txt index 95186387816..83e65246797 100644 --- a/source/blender/editors/space_view3d/CMakeLists.txt +++ b/source/blender/editors/space_view3d/CMakeLists.txt @@ -52,7 +52,7 @@ set(SRC view3d_gizmo_camera.c view3d_gizmo_empty.c view3d_gizmo_forcefield.c - view3d_gizmo_lamp.c + view3d_gizmo_light.c view3d_gizmo_navigate.c view3d_gizmo_navigate_type.c view3d_gizmo_preselect.c diff --git a/source/blender/editors/space_view3d/view3d_draw_legacy.c b/source/blender/editors/space_view3d/view3d_draw_legacy.c index 8db93ae3bba..09a3c9a5ed0 100644 --- a/source/blender/editors/space_view3d/view3d_draw_legacy.c +++ b/source/blender/editors/space_view3d/view3d_draw_legacy.c @@ -32,7 +32,7 @@ #include "DNA_object_types.h" #include "DNA_mesh_types.h" #include "DNA_key_types.h" -#include "DNA_lamp_types.h" +#include "DNA_light_types.h" #include "DNA_scene_types.h" #include "DNA_world_types.h" #include "DNA_brush_types.h" diff --git a/source/blender/editors/space_view3d/view3d_gizmo_empty.c b/source/blender/editors/space_view3d/view3d_gizmo_empty.c index 60549671aab..708d91fc823 100644 --- a/source/blender/editors/space_view3d/view3d_gizmo_empty.c +++ b/source/blender/editors/space_view3d/view3d_gizmo_empty.c @@ -29,7 +29,7 @@ #include "DEG_depsgraph.h" #include "DNA_object_types.h" -#include "DNA_lamp_types.h" +#include "DNA_light_types.h" #include "ED_screen.h" #include "ED_gizmo_library.h" diff --git a/source/blender/editors/space_view3d/view3d_gizmo_lamp.c b/source/blender/editors/space_view3d/view3d_gizmo_light.c index bd05240c93f..4680fadcb7f 100644 --- a/source/blender/editors/space_view3d/view3d_gizmo_lamp.c +++ b/source/blender/editors/space_view3d/view3d_gizmo_light.c @@ -28,7 +28,7 @@ #include "DEG_depsgraph.h" #include "DNA_object_types.h" -#include "DNA_lamp_types.h" +#include "DNA_light_types.h" #include "ED_screen.h" #include "ED_gizmo_library.h" diff --git a/source/blender/gpu/intern/gpu_draw.c b/source/blender/gpu/intern/gpu_draw.c index f6654ecfd0b..5d6b09f476b 100644 --- a/source/blender/gpu/intern/gpu_draw.c +++ b/source/blender/gpu/intern/gpu_draw.c @@ -36,7 +36,7 @@ #include "BLI_threads.h" #include "BLI_utildefines.h" -#include "DNA_lamp_types.h" +#include "DNA_light_types.h" #include "DNA_material_types.h" #include "DNA_mesh_types.h" #include "DNA_meshdata_types.h" diff --git a/source/blender/makesdna/DNA_lamp_types.h b/source/blender/makesdna/DNA_light_types.h index 2478ee24edf..2478ee24edf 100644 --- a/source/blender/makesdna/DNA_lamp_types.h +++ b/source/blender/makesdna/DNA_light_types.h diff --git a/source/blender/makesdna/intern/makesdna.c b/source/blender/makesdna/intern/makesdna.c index cd38ba1cb21..09600566436 100644 --- a/source/blender/makesdna/intern/makesdna.c +++ b/source/blender/makesdna/intern/makesdna.c @@ -75,7 +75,7 @@ static const char *includefiles[] = { "DNA_camera_types.h", "DNA_image_types.h", "DNA_texture_types.h", - "DNA_lamp_types.h", + "DNA_light_types.h", "DNA_material_types.h", "DNA_vfont_types.h", "DNA_meta_types.h", @@ -1408,7 +1408,7 @@ int main(int argc, char **argv) #include "DNA_camera_types.h" #include "DNA_image_types.h" #include "DNA_texture_types.h" -#include "DNA_lamp_types.h" +#include "DNA_light_types.h" #include "DNA_material_types.h" #include "DNA_vfont_types.h" #include "DNA_meta_types.h" diff --git a/source/blender/makesrna/intern/CMakeLists.txt b/source/blender/makesrna/intern/CMakeLists.txt index 5188ac425bf..4aee3458a92 100644 --- a/source/blender/makesrna/intern/CMakeLists.txt +++ b/source/blender/makesrna/intern/CMakeLists.txt @@ -48,9 +48,9 @@ set(DEFSRC rna_gpencil_modifier.c rna_image.c rna_key.c - rna_lamp.c rna_lattice.c rna_layer.c + rna_light.c rna_lightprobe.c rna_linestyle.c rna_main.c diff --git a/source/blender/makesrna/intern/makesrna.c b/source/blender/makesrna/intern/makesrna.c index 46445a85f6d..0fcd9e3599f 100644 --- a/source/blender/makesrna/intern/makesrna.c +++ b/source/blender/makesrna/intern/makesrna.c @@ -3408,7 +3408,7 @@ static RNAProcessItem PROCESS_ITEMS[] = { {"rna_gpencil.c", NULL, RNA_def_gpencil}, {"rna_image.c", "rna_image_api.c", RNA_def_image}, {"rna_key.c", NULL, RNA_def_key}, - {"rna_lamp.c", NULL, RNA_def_light}, + {"rna_light.c", NULL, RNA_def_light}, {"rna_lattice.c", "rna_lattice_api.c", RNA_def_lattice}, {"rna_layer.c", NULL, RNA_def_view_layer}, {"rna_linestyle.c", NULL, RNA_def_linestyle}, diff --git a/source/blender/makesrna/intern/rna_lamp.c b/source/blender/makesrna/intern/rna_light.c index aca9c148bcb..43c9ecef40d 100644 --- a/source/blender/makesrna/intern/rna_lamp.c +++ b/source/blender/makesrna/intern/rna_light.c @@ -30,7 +30,7 @@ #include "RNA_enum_types.h" #include "rna_internal.h" -#include "DNA_lamp_types.h" +#include "DNA_light_types.h" #include "DNA_material_types.h" #include "DNA_texture_types.h" diff --git a/source/blender/makesrna/intern/rna_main_api.c b/source/blender/makesrna/intern/rna_main_api.c index b8c9aa5c255..5675e00586c 100644 --- a/source/blender/makesrna/intern/rna_main_api.c +++ b/source/blender/makesrna/intern/rna_main_api.c @@ -53,7 +53,7 @@ #include "BKE_icons.h" #include "BKE_idcode.h" #include "BKE_image.h" -#include "BKE_lamp.h" +#include "BKE_light.h" #include "BKE_lattice.h" #include "BKE_library_remap.h" #include "BKE_lightprobe.h" @@ -81,7 +81,7 @@ #include "DNA_armature_types.h" #include "DNA_camera_types.h" #include "DNA_curve_types.h" -#include "DNA_lamp_types.h" +#include "DNA_light_types.h" #include "DNA_material_types.h" #include "DNA_mesh_types.h" #include "DNA_speaker_types.h" diff --git a/source/blender/makesrna/intern/rna_texture.c b/source/blender/makesrna/intern/rna_texture.c index 7de019f0989..ca1859895f5 100644 --- a/source/blender/makesrna/intern/rna_texture.c +++ b/source/blender/makesrna/intern/rna_texture.c @@ -23,7 +23,7 @@ #include <stdlib.h> #include "DNA_brush_types.h" -#include "DNA_lamp_types.h" +#include "DNA_light_types.h" #include "DNA_material_types.h" #include "DNA_object_types.h" #include "DNA_texture_types.h" diff --git a/source/blender/nodes/CMakeLists.txt b/source/blender/nodes/CMakeLists.txt index 40d83e83aa4..cc2bfbadf80 100644 --- a/source/blender/nodes/CMakeLists.txt +++ b/source/blender/nodes/CMakeLists.txt @@ -170,7 +170,7 @@ set(SRC shader/nodes/node_shader_normal.c shader/nodes/node_shader_normal_map.c shader/nodes/node_shader_object_info.c - shader/nodes/node_shader_output_lamp.c + shader/nodes/node_shader_output_light.c shader/nodes/node_shader_output_linestyle.c shader/nodes/node_shader_output_material.c shader/nodes/node_shader_output_world.c diff --git a/source/blender/nodes/shader/node_shader_tree.c b/source/blender/nodes/shader/node_shader_tree.c index 841c5beeedc..26973d619d9 100644 --- a/source/blender/nodes/shader/node_shader_tree.c +++ b/source/blender/nodes/shader/node_shader_tree.c @@ -24,7 +24,7 @@ #include <string.h> -#include "DNA_lamp_types.h" +#include "DNA_light_types.h" #include "DNA_material_types.h" #include "DNA_node_types.h" #include "DNA_scene_types.h" diff --git a/source/blender/nodes/shader/nodes/node_shader_output_lamp.c b/source/blender/nodes/shader/nodes/node_shader_output_light.c index e9afefe5ea1..e9afefe5ea1 100644 --- a/source/blender/nodes/shader/nodes/node_shader_output_lamp.c +++ b/source/blender/nodes/shader/nodes/node_shader_output_light.c diff --git a/source/blender/render/intern/source/render_texture.c b/source/blender/render/intern/source/render_texture.c index fa793b0cef8..4e38f8d569a 100644 --- a/source/blender/render/intern/source/render_texture.c +++ b/source/blender/render/intern/source/render_texture.c @@ -35,7 +35,7 @@ #include "DNA_anim_types.h" #include "DNA_texture_types.h" #include "DNA_object_types.h" -#include "DNA_lamp_types.h" +#include "DNA_light_types.h" #include "DNA_meshdata_types.h" #include "DNA_material_types.h" #include "DNA_image_types.h" |