diff options
author | Campbell Barton <ideasman42@gmail.com> | 2019-03-08 01:29:17 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2019-03-08 01:50:00 +0300 |
commit | 8f817de0cbef41dac81e6c7665ada509c3fe2988 (patch) | |
tree | 0802c3287116ce0bf600adc4bed8cba31cfc97b1 /source/blender/blenkernel/intern/object.c | |
parent | e68ac2827dd4f8ad346011a8a408b342e2718707 (diff) |
Cleanup: use plural names for Main lists
Convention was not to but after discussion on 918941483f7e we agree its
best to change the convention.
Names now mostly follow RNA.
Some exceptions:
- Use 'nodetrees' instead of 'nodegroups'
since the struct is called NodeTree.
- Use 'gpencils' instead of 'grease_pencil'
since 'gpencil' is a common abbreviation in the C code.
Other exceptions:
- Leave 'wm' as it's a list of one.
- Leave 'ipo' as is for versioning.
Diffstat (limited to 'source/blender/blenkernel/intern/object.c')
-rw-r--r-- | source/blender/blenkernel/intern/object.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/blenkernel/intern/object.c b/source/blender/blenkernel/intern/object.c index 1743060aa97..bdca469dc8e 100644 --- a/source/blender/blenkernel/intern/object.c +++ b/source/blender/blenkernel/intern/object.c @@ -749,7 +749,7 @@ bool BKE_object_exists_check(Main *bmain, const Object *obtest) if (obtest == NULL) return false; - ob = bmain->object.first; + ob = bmain->objects.first; while (ob) { if (ob == obtest) return true; ob = ob->id.next; @@ -3772,7 +3772,7 @@ bool BKE_object_is_animated(Scene *scene, Object *ob) int BKE_object_scenes_users_get(Main *bmain, Object *ob) { int num_scenes = 0; - for (Scene *scene = bmain->scene.first; scene != NULL; scene = scene->id.next) { + for (Scene *scene = bmain->scenes.first; scene != NULL; scene = scene->id.next) { if (BKE_collection_has_object_recursive(BKE_collection_master(scene), ob)) { num_scenes++; } |