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/blenkernel/intern/node.c | |
| parent | ce104ca89643c4b0e6358fd22a2b056ecd603e62 (diff) | |
DNA: rename Lamp -> Light
- BKE_lamp -> BKE_light
- Main.lamp -> light
Diffstat (limited to 'source/blender/blenkernel/intern/node.c')
| -rw-r--r-- | source/blender/blenkernel/intern/node.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/source/blender/blenkernel/intern/node.c b/source/blender/blenkernel/intern/node.c index 70e38e86c0c..b8ccd0d9274 100644 --- a/source/blender/blenkernel/intern/node.c +++ b/source/blender/blenkernel/intern/node.c @@ -1965,7 +1965,7 @@ bNodeTree *ntreeFromID(const ID *id) { switch (GS(id->name)) { case ID_MA: return ((const Material *)id)->nodetree; - case ID_LA: return ((const Lamp *)id)->nodetree; + case ID_LA: return ((const Light *)id)->nodetree; case ID_WO: return ((const World *)id)->nodetree; case ID_TE: return ((const Tex *)id)->nodetree; case ID_SCE: return ((const Scene *)id)->nodetree; @@ -3694,7 +3694,7 @@ void BKE_node_tree_iter_init(struct NodeTreeIterStore *ntreeiter, struct Main *b ntreeiter->scene = bmain->scene.first; ntreeiter->mat = bmain->mat.first; ntreeiter->tex = bmain->tex.first; - ntreeiter->lamp = bmain->lamp.first; + ntreeiter->light = bmain->light.first; ntreeiter->world = bmain->world.first; ntreeiter->linestyle = bmain->linestyle.first; } @@ -3721,10 +3721,10 @@ bool BKE_node_tree_iter_step(struct NodeTreeIterStore *ntreeiter, *r_id = (ID *)ntreeiter->tex; ntreeiter->tex = ntreeiter->tex->id.next; } - else if (ntreeiter->lamp) { - *r_nodetree = ntreeiter->lamp->nodetree; - *r_id = (ID *)ntreeiter->lamp; - ntreeiter->lamp = ntreeiter->lamp->id.next; + else if (ntreeiter->light) { + *r_nodetree = ntreeiter->light->nodetree; + *r_id = (ID *)ntreeiter->light; + ntreeiter->light = ntreeiter->light->id.next; } else if (ntreeiter->world) { *r_nodetree = ntreeiter->world->nodetree; |