diff options
author | Campbell Barton <ideasman42@gmail.com> | 2019-02-27 02:46:48 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2019-02-27 03:03:16 +0300 |
commit | 3051e2f4ae8fd3e72a43dd1e5d40893d0efec500 (patch) | |
tree | 6de62ee531c71705a8d86592770d26f8ecb75d1f /source/blender/depsgraph/intern | |
parent | ce104ca89643c4b0e6358fd22a2b056ecd603e62 (diff) |
DNA: rename Lamp -> Light
- BKE_lamp -> BKE_light
- Main.lamp -> light
Diffstat (limited to 'source/blender/depsgraph/intern')
5 files changed, 15 insertions, 15 deletions
diff --git a/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc b/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc index 51fc69fcee4..6c9d008c904 100644 --- a/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc +++ b/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc @@ -424,7 +424,7 @@ void DepsgraphNodeBuilder::build_id(ID *id) build_shapekeys((Key *)id); break; case ID_LA: - build_lamp((Lamp *)id); + build_lamp((Light *)id); break; case ID_LP: build_lightprobe((LightProbe *)id); @@ -722,7 +722,7 @@ void DepsgraphNodeBuilder::build_object_data_camera(Object *object) void DepsgraphNodeBuilder::build_object_data_lamp(Object *object) { - Lamp *lamp = (Lamp *)object->data; + Light *lamp = (Light *)object->data; build_lamp(lamp); } @@ -1417,7 +1417,7 @@ void DepsgraphNodeBuilder::build_camera(Camera *camera) op_node->set_as_exit(); } -void DepsgraphNodeBuilder::build_lamp(Lamp *lamp) +void DepsgraphNodeBuilder::build_lamp(Light *lamp) { if (built_map_.checkIsBuiltAndTag(lamp)) { return; diff --git a/source/blender/depsgraph/intern/builder/deg_builder_nodes.h b/source/blender/depsgraph/intern/builder/deg_builder_nodes.h index 40e710e755d..b80b54432d4 100644 --- a/source/blender/depsgraph/intern/builder/deg_builder_nodes.h +++ b/source/blender/depsgraph/intern/builder/deg_builder_nodes.h @@ -40,8 +40,8 @@ struct GHash; struct ID; struct Image; struct Key; -struct Lamp; struct LayerCollection; +struct Light; struct LightProbe; struct ListBase; struct MTex; @@ -204,7 +204,7 @@ struct DepsgraphNodeBuilder { void build_armature(bArmature *armature); void build_shapekeys(Key *key); void build_camera(Camera *camera); - void build_lamp(Lamp *lamp); + void build_lamp(Light *lamp); void build_nodetree(bNodeTree *ntree); void build_material(Material *ma); void build_texture(Tex *tex); diff --git a/source/blender/depsgraph/intern/builder/deg_builder_relations.cc b/source/blender/depsgraph/intern/builder/deg_builder_relations.cc index 35ec6269572..6a611e95e8a 100644 --- a/source/blender/depsgraph/intern/builder/deg_builder_relations.cc +++ b/source/blender/depsgraph/intern/builder/deg_builder_relations.cc @@ -495,7 +495,7 @@ void DepsgraphRelationBuilder::build_id(ID *id) build_shapekeys((Key *)id); break; case ID_LA: - build_lamp((Lamp *)id); + build_lamp((Light *)id); break; case ID_LP: build_lightprobe((LightProbe *)id); @@ -806,7 +806,7 @@ void DepsgraphRelationBuilder::build_object_data_camera(Object *object) void DepsgraphRelationBuilder::build_object_data_lamp(Object *object) { - Lamp *lamp = (Lamp *)object->data; + Light *lamp = (Light *)object->data; build_lamp(lamp); ComponentKey lamp_parameters_key(&lamp->id, NodeType::PARAMETERS); ComponentKey object_parameters_key(&object->id, NodeType::PARAMETERS); @@ -2349,7 +2349,7 @@ void DepsgraphRelationBuilder::build_camera(Camera *camera) } /* Lamps */ -void DepsgraphRelationBuilder::build_lamp(Lamp *lamp) +void DepsgraphRelationBuilder::build_lamp(Light *lamp) { if (built_map_.checkIsBuiltAndTag(lamp)) { return; diff --git a/source/blender/depsgraph/intern/builder/deg_builder_relations.h b/source/blender/depsgraph/intern/builder/deg_builder_relations.h index f81f079dbb6..1b115034608 100644 --- a/source/blender/depsgraph/intern/builder/deg_builder_relations.h +++ b/source/blender/depsgraph/intern/builder/deg_builder_relations.h @@ -52,8 +52,8 @@ struct FCurve; struct GHash; struct ID; struct Key; -struct Lamp; struct LayerCollection; +struct Light; struct LightProbe; struct ListBase; struct MTex; @@ -265,7 +265,7 @@ struct DepsgraphRelationBuilder void build_shapekeys(Key *key); void build_armature(bArmature *armature); void build_camera(Camera *camera); - void build_lamp(Lamp *lamp); + void build_lamp(Light *lamp); void build_nodetree(bNodeTree *ntree); void build_material(Material *ma); void build_texture(Tex *tex); 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 25295a30499..0882b98ef07 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 @@ -102,7 +102,7 @@ namespace { union NestedIDHackTempStorage { Curve curve; FreestyleLineStyle linestyle; - Lamp lamp; + Light lamp; Lattice lattice; Material material; Mesh mesh; @@ -123,7 +123,7 @@ void nested_id_hack_discard_pointers(ID *id_cow) } SPECIAL_CASE(ID_LS, FreestyleLineStyle, nodetree) - SPECIAL_CASE(ID_LA, Lamp, nodetree) + SPECIAL_CASE(ID_LA, Light, nodetree) SPECIAL_CASE(ID_MA, Material, nodetree) SPECIAL_CASE(ID_TE, Tex, nodetree) SPECIAL_CASE(ID_WO, World, nodetree) @@ -176,7 +176,7 @@ const ID *nested_id_hack_get_discarded_pointers(NestedIDHackTempStorage *storage } SPECIAL_CASE(ID_LS, FreestyleLineStyle, nodetree, linestyle) - SPECIAL_CASE(ID_LA, Lamp, nodetree, lamp) + SPECIAL_CASE(ID_LA, Light, nodetree, lamp) SPECIAL_CASE(ID_MA, Material, nodetree, material) SPECIAL_CASE(ID_TE, Tex, nodetree, tex) SPECIAL_CASE(ID_WO, World, nodetree, world) @@ -217,7 +217,7 @@ void nested_id_hack_restore_pointers(const ID *old_id, ID *new_id) } SPECIAL_CASE(ID_LS, FreestyleLineStyle, nodetree) - SPECIAL_CASE(ID_LA, Lamp, nodetree) + SPECIAL_CASE(ID_LA, Light, nodetree) SPECIAL_CASE(ID_MA, Material, nodetree) SPECIAL_CASE(ID_SCE, Scene, nodetree) SPECIAL_CASE(ID_TE, Tex, nodetree) @@ -255,7 +255,7 @@ void ntree_hack_remap_pointers(const Depsgraph *depsgraph, ID *id_cow) } SPECIAL_CASE(ID_LS, FreestyleLineStyle, nodetree, bNodeTree) - SPECIAL_CASE(ID_LA, Lamp, nodetree, bNodeTree) + SPECIAL_CASE(ID_LA, Light, nodetree, bNodeTree) SPECIAL_CASE(ID_MA, Material, nodetree, bNodeTree) SPECIAL_CASE(ID_SCE, Scene, nodetree, bNodeTree) SPECIAL_CASE(ID_TE, Tex, nodetree, bNodeTree) |