Cleanup: file rename lamp -> light
authorCampbell Barton <ideasman42@gmail.com>
Wed, 27 Feb 2019 01:34:56 +0000 (12:34 +1100)
committerCampbell Barton <ideasman42@gmail.com>
Wed, 27 Feb 2019 01:36:32 +0000 (12:36 +1100)
70 files changed:
source/blender/CMakeLists.txt
source/blender/blenkernel/BKE_light.h [moved from source/blender/blenkernel/BKE_lamp.h with 100% similarity]
source/blender/blenkernel/BKE_node.h
source/blender/blenkernel/CMakeLists.txt
source/blender/blenkernel/intern/anim_sys.c
source/blender/blenkernel/intern/camera.c
source/blender/blenkernel/intern/icons.c
source/blender/blenkernel/intern/ipo.c
source/blender/blenkernel/intern/library.c
source/blender/blenkernel/intern/library_query.c
source/blender/blenkernel/intern/library_remap.c
source/blender/blenkernel/intern/light.c [moved from source/blender/blenkernel/intern/lamp.c with 98% similarity]
source/blender/blenkernel/intern/node.c
source/blender/blenkernel/intern/object.c
source/blender/blenkernel/intern/object_update.c
source/blender/blenkernel/intern/smoke.c
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/versioning_250.c
source/blender/blenloader/intern/versioning_280.c
source/blender/blenloader/intern/versioning_legacy.c
source/blender/blenloader/intern/writefile.c
source/blender/collada/AnimationExporter.h
source/blender/collada/AnimationImporter.h
source/blender/collada/BCSampleData.h
source/blender/collada/DocumentImporter.cpp
source/blender/collada/LightExporter.h
source/blender/collada/collada_utils.h
source/blender/compositor/operations/COM_GlareThresholdOperation.h
source/blender/depsgraph/intern/builder/deg_builder_nodes.cc
source/blender/depsgraph/intern/builder/deg_builder_relations.cc
source/blender/depsgraph/intern/eval/deg_eval_copy_on_write.cc
source/blender/draw/CMakeLists.txt
source/blender/draw/engines/eevee/eevee_materials.c
source/blender/draw/engines/eevee/eevee_volumes.c
source/blender/draw/engines/eevee/shaders/lights_lib.glsl [moved from source/blender/draw/engines/eevee/shaders/lamps_lib.glsl with 100% similarity]
source/blender/draw/intern/DRW_render.h
source/blender/editors/animation/anim_channels_defines.c
source/blender/editors/animation/anim_filter.c
source/blender/editors/interface/interface_templates.c
source/blender/editors/object/object_add.c
source/blender/editors/object/object_relations.c
source/blender/editors/object/object_select.c
source/blender/editors/object/object_transform.c
source/blender/editors/render/render_preview.c
source/blender/editors/render/render_shading.c
source/blender/editors/render/render_update.c
source/blender/editors/space_buttons/buttons_context.c
source/blender/editors/space_node/node_draw.c
source/blender/editors/space_node/node_edit.c
source/blender/editors/space_node/space_node.c
source/blender/editors/space_outliner/outliner_draw.c
source/blender/editors/space_outliner/outliner_select.c
source/blender/editors/space_outliner/outliner_tools.c
source/blender/editors/space_outliner/outliner_tree.c
source/blender/editors/space_view3d/CMakeLists.txt
source/blender/editors/space_view3d/view3d_draw_legacy.c
source/blender/editors/space_view3d/view3d_gizmo_empty.c
source/blender/editors/space_view3d/view3d_gizmo_light.c [moved from source/blender/editors/space_view3d/view3d_gizmo_lamp.c with 99% similarity]
source/blender/gpu/intern/gpu_draw.c
source/blender/makesdna/DNA_light_types.h [moved from source/blender/makesdna/DNA_lamp_types.h with 100% similarity]
source/blender/makesdna/intern/makesdna.c
source/blender/makesrna/intern/CMakeLists.txt
source/blender/makesrna/intern/makesrna.c
source/blender/makesrna/intern/rna_light.c [moved from source/blender/makesrna/intern/rna_lamp.c with 99% similarity]
source/blender/makesrna/intern/rna_main_api.c
source/blender/makesrna/intern/rna_texture.c
source/blender/nodes/CMakeLists.txt
source/blender/nodes/shader/node_shader_tree.c
source/blender/nodes/shader/nodes/node_shader_output_light.c [moved from source/blender/nodes/shader/nodes/node_shader_output_lamp.c with 100% similarity]
source/blender/render/intern/source/render_texture.c

index c51e0b5b01c9cb259f2bdb6c4363871a1db8f188..7b21e8797292c6766d28d409be7298b8e34e4233 100644 (file)
@@ -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
index 7e924ded048760d9ff02bcb5cd4c712b7184adcd..6e6ec31aa6a41b170ac74c3c4238ed661c44ecc6 100644 (file)
@@ -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"
index e3afbc507bf6072a57b91e75a3355b13391bb598..c882be972f5ecba97e5b5618ee882caad4474cf2 100644 (file)
@@ -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
index 3cbc81e887ace5fafddb683cdb12ca32847ba427..acbf0068a57fa6722faf3b8beedab93eeafe9c66 100644 (file)
@@ -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"
index ce80aac5596c991fcaf0822282ea41e1bbecbb0b..cfcf5eeed96dc73bc673b6081a18899e7ba5cffa 100644 (file)
@@ -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"
index 24d548c18c6418ac50347bb7de7d19a52c910333..bad1e6620ebf81f26466f0809dae8919b23f6590 100644 (file)
@@ -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"
index 1813edbafb457fcee3922b01c0900d43533e8625..356271d82bd56c3048e98c48102b7e6a31dda245 100644 (file)
@@ -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"
index 5ff1418cf6a0dec00fd94d96dde7b663e2438de4..68dcbd484286ce7e822dfdb15bdbb8d10992c9ed 100644 (file)
@@ -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"
index 65bece543060ff8161a98263c295ab17371815ae..e30dd9cdf5e4593cb8681fe25b8981f059d5f506 100644 (file)
@@ -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"
index a5fdcfcb0f2f0b8b58fdb3bca66163dc80135484..e965e2a6aac26afd18b1903e1ebd852d66c67484 100644 (file)
@@ -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"
similarity index 98%
rename from source/blender/blenkernel/intern/lamp.c
rename to source/blender/blenkernel/intern/light.c
index 318f5e7a046e5bde6bd5b4ec50c8b90a7562beee..b1ec5ba6954c5526f1b34045ae466c8b307d2bf1 100644 (file)
@@ -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"
index 83c9697ae1e1ce70baef76086cbfa2fa4be8d37d..4585c343d95a38f1e324ad2f6c38412c07d50d61 100644 (file)
@@ -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"
index 460c50d0d0ba0b5374aa585fd1b3c4e1450bb1b1..1b4aad16778d6fda2b0cab2caed5b0808eb0966e 100644 (file)
@@ -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"
index 955f2f905d3dc44510b68105e00e573b81e50fe1..dd0b5668c251f03dcf367fc041473fbe25c0c36f 100644 (file)
@@ -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"
index d7ff640bce87bd341e9d7e9e339fbf3d49d72d4f..4b9dd9ac6e36d593dfdfae0efdfcc84249505a8a 100644 (file)
@@ -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"
index 74aadc00f937ceec599aa26e06c1e8c85abed8bc..2472e900e80f35b53e3f65bf0413288fe29211c0 100644 (file)
@@ -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"
index 1a92a75af096179714524055ebd98f6f184a8d3a..e894ef45b4021084297e64656ad5839a859c9c95 100644 (file)
@@ -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"
index f77d3207661e41ae98654efa7f99c14347cc5380..89525cdde210762eaea740400d07543a739a7850 100644 (file)
@@ -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"
index d2aab2bf97b11c6b30d5dd1dae255e7396c18271..cacd7e5720fb9f740e53a4e114465a6e220e3fca 100644 (file)
@@ -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"
index 42a39ddeca904a157defb0bc74a52fcf7a59c5bf..235f9b2a799598a09d1585ea205ea9b12582f7eb 100644 (file)
 #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"
index 700f9f510a21508435f4e56f66d0a202a357b999..295ec66a4e807e5ed69213eaf6cc02e421294078 100644 (file)
@@ -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"
index f8e6c6ce1d84362ed78e1b565ca7538d3bb037da..e5d431a05c0a4fbef94c1e0dc8f6915497aebc00 100644 (file)
@@ -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"
 }
 
index affc338518e8786609990e122b100aea0423e599..ec7f14f8c3a1a9c43ad841d69cb7a3d3c909aa6d 100644 (file)
@@ -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"
 }
 
index a81fa6c5c31726d6020e2be217cee03ad23908a3..97d4f056d0b0e057965f8459a7215374cd453bf7 100644 (file)
@@ -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"
 
index 3e5decfdbd8c0ed535a7224c0a9def1b5107ceab..7cd0d2979e536b246239c45c3d10cd82d909c500 100644 (file)
@@ -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"
 
index 9eeedb230e634a78d72a106f18236e5bcbb2c17a..32c89cf41e6cbfd73a108c98b255896df21ebb87 100644 (file)
@@ -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"
index 63e61cbfa978831b72d9301b790abb705f090fdc..2a38783511fe06ca7192ef228dcb00c43ace726f 100644 (file)
@@ -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:
index 25f1af9c6207d337b24db469eb2e3a54af18aa70..0fe4afd7b55ec143d6b25e77a924e7215c65e8f4 100644 (file)
@@ -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"
index 2a9f81b8495152ef7085473efd0705c37da62a0e..99334c81db55d73fb0235ce9b75ebae3de4a91e1 100644 (file)
@@ -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"
index 0882b98ef072e6eb33d6d85ef87eb3132a88567a..bd713058cce3f09b9d58cc119ee067459eb5b3b4 100644 (file)
@@ -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"
index 80878ae92467ceddd8c0bb596a912fb5e3488a12..aea08f87a8461d19aeb34e01ae627e43420da6d1 100644 (file)
@@ -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)
index eec61ffd08c9020f05985fcdaf91c03c1767b2c3..5a808f2a01fb251ffc72852f9664c1d94ef8c233 100644 (file)
@@ -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);
 
index 53c08c4d8f34482e907d4113d99304e7c13ca846..cf12863565fd87eb7a63aa891b4b8d77e5bcbe7a 100644 (file)
@@ -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(
index 8d5518a6b998f81a38f7077b4d1ba10c3494d3e0..d79b7caf5e72e922b2e7f9ec40274334a17059b4 100644 (file)
@@ -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"
index 22e1c75c00e9e8869c16c2e03fdf775643d388ed..29ae22cd306c25dc7a31de591a4c24779083f9e1 100644 (file)
@@ -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"
index c29a2f403c9c599f6ba44f010299286fd9f788aa..5a0deaddb353d39088ec71b12a116a57862045a6 100644 (file)
@@ -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"
index 3159177e6248b5da721f47974ebd256b31a3c601..0d7dbd0d4417e32730b306563280d6cda53285d0 100644 (file)
@@ -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"
 
index 61853f05f46addcd319e3b2468edcbdfcd0a07e9..b95aa6c787ac69eb68fbd3b7dacce9c1f12da480 100644 (file)
@@ -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"
 
 #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[] = {
index de17b3ca28170504651d2462f443cbd628ecc50e..4d6864d20239fdffff873220f1889e24da253f2f 100644 (file)
@@ -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"
index f06343abcaed13bef011e1a6d0b34b20e0ce5747..96dc18b41f0e39a0ab47237a7b26421c87671033 100644 (file)
@@ -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"
 
index ebc6f35e43ee86225d39d1c7193c4c6347ee2d21..ea51fdb5c864a32a5dd0a6570740497db128f867 100644 (file)
@@ -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"
index 53c9f4281968a17c9f3c2e5f06784842b1e7623c..5ea63901085bf188517cf76c102945fb8d6aac81 100644 (file)
@@ -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"
index 1afe0763699f495102561b264a297fe1ed3c7461..d1bed15872d5e84f2b93662217dea6fc8a6b25f6 100644 (file)
@@ -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"
index 6dd2d34572637842185f86ac9e8794a0be633027..462fd997fc595604bdfcf07876e5b54ef5adc342 100644 (file)
@@ -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"
index 97b4578d9516195270ff8b17cf35379ac76adf2f..10c0a6f4a57cbed9553e7dccf7e9684e5f07aa3e 100644 (file)
@@ -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"
index ffc9ba54c99281439094db085860cfc9fc99e756..0a33e5ebf12e2502b9c1ec17d051d43ee0e629fe 100644 (file)
@@ -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"
index 6347548cd7e7791a145fb8754c21116fc4b0de22..038ab62af7895e8f8213a5e8ac57f2552b2860e8 100644 (file)
@@ -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"
index b94a27b783915ff90fe60e32c46bd29a6b63d458..fc8d880080daa67780fce2f171766823aa42fa61 100644 (file)
@@ -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"
index ff6def955cec0b9fff308d7e35d956f8f642712f..ba6a2d9f318fa885f333b6d82cdf0dd65827500d 100644 (file)
@@ -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"
index 131701e8bcb6bcb46062cc6d1d69be23bbb82828..1f59658b8ab666e81d98d946d7713e7b4a00e231 100644 (file)
@@ -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"
index b1911895bf2e11c6a70e0c85d68e970958610c40..8aa8eb04954166d051ac2f20e7bb2eb8dd087184 100644 (file)
@@ -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"
index 09176e0862147e1156c0309f8c93b609cf46a347..f98913c34ed616ccc831306a1d2410f7475602e2 100644 (file)
@@ -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"
index 95186387816ba1ceb55df766f4cc6727a6fd21e4..83e65246797c2a5dc15e87869d3958cd21b84e57 100644 (file)
@@ -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
index 8db93ae3bba53017a874a88d0cc7f7376ba77889..09a3c9a5ed0d4acacc6e4c0dc3e13bc332a3c011 100644 (file)
@@ -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"
index 60549671aab1bd4303d7e71d90d2863b23cb7c38..708d91fc82364c788188a373bd1e05b8da89178f 100644 (file)
@@ -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"
similarity index 99%
rename from source/blender/editors/space_view3d/view3d_gizmo_lamp.c
rename to source/blender/editors/space_view3d/view3d_gizmo_light.c
index bd05240c93f514541b849cd62fd1f91af7f1752e..4680fadcb7fb46796177d9a39dc4d4f4b5a8e06c 100644 (file)
@@ -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"
index f6654ecfd0b2f45701385bc8f63b03de8a38fabe..5d6b09f476b223792bb0f7bd59c38721f795128c 100644 (file)
@@ -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"
index cd38ba1cb21d6f9c3a426d7ccb60ca10180b9101..096005664360795517785c00ff25490165bc6870 100644 (file)
@@ -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"
index 5188ac425bf58df4be7ce92955519549483fcdbd..4aee3458a9230224fbcc4af3c3f2c060b928724c 100644 (file)
@@ -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
index 46445a85f6dadd4969753ad55a7e39446ca2b824..0fcd9e3599f2190b5c79f36444d43efb313b87ab 100644 (file)
@@ -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},
similarity index 99%
rename from source/blender/makesrna/intern/rna_lamp.c
rename to source/blender/makesrna/intern/rna_light.c
index aca9c148bcb9fb18453699765b4c15922e8afa85..43c9ecef40d5f8d413810a2950dfe2a28950910c 100644 (file)
@@ -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"
 
index b8c9aa5c255e082ec5b668b3ba000e0ca6b719cd..5675e00586c21f800fbe0290b5f9e5ad0a070777 100644 (file)
@@ -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"
index 7de019f0989773d73d7a3ab0ebff538bb793ca41..ca1859895f5dead48b209e6b2467bdeab70ce9cf 100644 (file)
@@ -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"
index 40d83e83aa4c1598aafb2c3eb71d5dd1b6244fab..cc2bfbadf8082106fa7d39c0e4700c478f9c21da 100644 (file)
@@ -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
index 841c5beeedc815eeefe85e00a9612dec39f2360c..26973d619d9fd5587a6a711ff9b25a3e4c7eb4cf 100644 (file)
@@ -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"
index fa793b0cef8d4ec6d01124d68c5b3a19bc4a05a9..4e38f8d569ab2969e031c9400c6cb9906a9aad65 100644 (file)
@@ -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"