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/eval/deg_eval_copy_on_write.cc | |
| parent | ce104ca89643c4b0e6358fd22a2b056ecd603e62 (diff) | |
DNA: rename Lamp -> Light
- BKE_lamp -> BKE_light
- Main.lamp -> light
Diffstat (limited to 'source/blender/depsgraph/intern/eval/deg_eval_copy_on_write.cc')
| -rw-r--r-- | source/blender/depsgraph/intern/eval/deg_eval_copy_on_write.cc | 10 |
1 files changed, 5 insertions, 5 deletions
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) |