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 c51e0b5..7b21e87 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 7e924de..6e6ec31 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 e3afbc5..c882be9 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 3cbc81e..acbf006 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 ce80aac..cfcf5ee 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 24d548c..bad1e66 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 1813edb..356271d 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 5ff1418..68dcbd4 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 65bece5..e30dd9c 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 a5fdcfc..e965e2a 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 318f5e7..b1ec5ba 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 83c9697..4585c34 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 460c50d..1b4aad1 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 955f2f9..dd0b566 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 d7ff640..4b9dd9a 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 74aadc0..2472e90 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 1a92a75..e894ef4 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 f77d320..89525cd 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 d2aab2b..cacd7e5 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 42a39dd..235f9b2 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 700f9f5..295ec66 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 f8e6c6c..e5d431a 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 affc338..ec7f14f 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 a81fa6c..97d4f05 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 3e5decf..7cd0d29 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 9eeedb2..32c89cf 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 63e61cb..2a38783 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 25f1af9..0fe4afd 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 2a9f81b..99334c8 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 0882b98..bd71305 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 80878ae..aea08f8 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 eec61ff..5a808f2 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 53c08c4..cf12863 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 8d5518a..d79b7ca 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 22e1c75..29ae22c 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 c29a2f4..5a0dead 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 3159177..0d7dbd0 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 61853f0..b95aa6c 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 de17b3c..4d6864d 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 f06343a..96dc18b 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 ebc6f35..ea51fdb 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 53c9f42..5ea6390 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 1afe076..d1bed15 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 6dd2d34..462fd99 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 97b4578..10c0a6f 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 ffc9ba5..0a33e5e 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 6347548..038ab62 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 b94a27b..fc8d880 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 ff6def9..ba6a2d9 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 131701e..1f59658 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 b191189..8aa8eb0 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 09176e0..f98913c 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 9518638..83e6524 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 8db93ae..09a3c9a 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 6054967..708d91f 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"
@@ -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 f6654ec..5d6b09f 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 cd38ba1..0960056 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 5188ac4..4aee345 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 46445a8..0fcd9e3 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 aca9c14..43c9ece 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 b8c9aa5..5675e00 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 7de019f..ca18598 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 40d83e8..cc2bfba 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 841c5be..26973d6 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 fa793b0..4e38f8d 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"