[Bf-blender-cvs] [d2b91a1] render-layers: Rename CollectionBase > LayerCollection
Dalai Felinto
noreply at git.blender.org
Sat Dec 3 02:44:14 CET 2016
Commit: d2b91a1c7ce50e2586c04b6162fba6b0a26dbb17
Author: Dalai Felinto
Date: Fri Dec 2 18:07:56 2016 +0100
Branches: render-layers
https://developer.blender.org/rBd2b91a1c7ce50e2586c04b6162fba6b0a26dbb17
Rename CollectionBase > LayerCollection
===================================================================
M source/blender/blenkernel/BKE_layer.h
M source/blender/blenkernel/intern/layer.c
M source/blender/blenloader/intern/versioning_280.c
M source/blender/makesdna/DNA_layer_types.h
===================================================================
diff --git a/source/blender/blenkernel/BKE_layer.h b/source/blender/blenkernel/BKE_layer.h
index 81f3af6..b0f1601 100644
--- a/source/blender/blenkernel/BKE_layer.h
+++ b/source/blender/blenkernel/BKE_layer.h
@@ -35,7 +35,7 @@ extern "C" {
#define TODO_LAYER_OVERRIDE
struct SceneCollection;
-struct CollectionBase;
+struct LayerCollection;
struct ID;
struct Main;
struct SceneLayer;
@@ -47,11 +47,11 @@ bool BKE_scene_layer_remove(struct Main *bmain, struct Scene *scene, struct Scen
void BKE_scene_layer_engine_set(struct SceneLayer *sl, const char *engine);
-struct CollectionBase *BKE_collection_link(struct SceneLayer *sl, struct SceneCollection *sc);
+struct LayerCollection *BKE_collection_link(struct SceneLayer *sl, struct SceneCollection *sc);
-void BKE_collection_unlink(struct SceneLayer *sl, struct CollectionBase *cb);
+void BKE_collection_unlink(struct SceneLayer *sl, struct LayerCollection *lc);
-void BKE_collection_override_datablock_add(struct CollectionBase *cb, const char *data_path, struct ID *id);
+void BKE_collection_override_datablock_add(struct LayerCollection *lc, const char *data_path, struct ID *id);
#ifdef __cplusplus
diff --git a/source/blender/blenkernel/intern/layer.c b/source/blender/blenkernel/intern/layer.c
index bf3aa34..eb84eb3 100644
--- a/source/blender/blenkernel/intern/layer.c
+++ b/source/blender/blenkernel/intern/layer.c
@@ -41,7 +41,7 @@
#include "MEM_guardedalloc.h"
/* prototype */
-CollectionBase *collection_base_add(SceneLayer *sl, ListBase *lb, SceneCollection *sc);
+LayerCollection *layer_collection_add(SceneLayer *sl, ListBase *lb, SceneCollection *sc);
/* RenderLayer */
@@ -55,7 +55,7 @@ SceneLayer *BKE_scene_layer_add(Scene *scene, const char *name)
BLI_strncpy(sl->name, name, sizeof(sl->name));
SceneCollection *sc = BKE_collection_master(scene);
- collection_base_add(sl, &sl->collection_bases, sc);
+ layer_collection_add(sl, &sl->collections, sc);
return sl;
}
@@ -77,7 +77,7 @@ bool BKE_scene_layer_remove(Main *bmain, Scene *scene, SceneLayer *sl)
BLI_freelistN(&sl->object_bases);
//layer_collections_free(rl, &rl->collection_bases);
- BLI_freelistN(&sl->collection_bases);
+ BLI_freelistN(&sl->collections);
MEM_freeN(sl);
@@ -139,21 +139,21 @@ static ObjectBase *object_base_add(SceneLayer *sl, Object *ob)
* Link a collection to a renderlayer
* The collection needs to be created separately
*/
-CollectionBase *BKE_collection_link(SceneLayer *sl, SceneCollection *sc)
+LayerCollection *BKE_collection_link(SceneLayer *sl, SceneCollection *sc)
{
- CollectionBase *base = collection_base_add(sl, &sl->collection_bases, sc);
- return base;
+ LayerCollection *lc = layer_collection_add(sl, &sl->collections, sc);
+ return lc;
}
-static void collection_base_free(SceneLayer *sl, CollectionBase *cb)
+static void layer_collection_free(SceneLayer *sl, LayerCollection *lc)
{
- for (CollectionBase *ncb = cb->collection_bases.first; ncb; ncb = ncb->next) {
- for (LinkData *link = ncb->object_bases.first; link; link = link->next) {
+ for (LayerCollection *nlc = lc->collections.first; nlc; nlc = nlc->next) {
+ for (LinkData *link = nlc->object_bases.first; link; link = link->next) {
scene_layer_object_base_unref(sl, link->data);
}
- BLI_freelistN(&ncb->object_bases);
- collection_base_free(sl, ncb);
+ BLI_freelistN(&nlc->object_bases);
+ layer_collection_free(sl, nlc);
}
}
@@ -161,15 +161,15 @@ static void collection_base_free(SceneLayer *sl, CollectionBase *cb)
* Unlink a collection base from a renderlayer
* The corresponding collection is not removed from the master collection
*/
-void BKE_collection_unlink(SceneLayer *sl, CollectionBase *cb)
+void BKE_collection_unlink(SceneLayer *sl, LayerCollection *lc)
{
- collection_base_free(sl, cb);
+ layer_collection_free(sl, lc);
- BLI_remlink(&sl->collection_bases, cb);
- MEM_freeN(cb);
+ BLI_remlink(&sl->collections, lc);
+ MEM_freeN(lc);
}
-static void object_base_populate(SceneLayer *sl, CollectionBase *cb, ListBase *objects)
+static void object_base_populate(SceneLayer *sl, LayerCollection *lc, ListBase *objects)
{
for (LinkData *link = objects->first; link; link = link->next) {
ObjectBase *base = BLI_findptr(&sl->object_bases, link->data, offsetof(ObjectBase, object));
@@ -179,36 +179,36 @@ static void object_base_populate(SceneLayer *sl, CollectionBase *cb, ListBase *o
}
else {
/* only add an object once */
- if (BLI_findptr(&cb->object_bases, base, offsetof(LinkData, data))) {
+ if (BLI_findptr(&lc->object_bases, base, offsetof(LinkData, data))) {
continue;
}
}
base->refcount++;
- BLI_addtail(&cb->object_bases, BLI_genericNodeN(base));
+ BLI_addtail(&lc->object_bases, BLI_genericNodeN(base));
}
}
-static void collection_base_populate(SceneLayer *sl, CollectionBase *cb, SceneCollection *sc)
+static void layer_collection_populate(SceneLayer *sl, LayerCollection *lc, SceneCollection *sc)
{
- object_base_populate(sl, cb, &sc->objects);
- object_base_populate(sl, cb, &sc->filter_objects);
+ object_base_populate(sl, lc, &sc->objects);
+ object_base_populate(sl, lc, &sc->filter_objects);
for (SceneCollection *nsc = sc->collections.first; nsc; nsc = nsc->next) {
- collection_base_add(sl, &cb->collection_bases, nsc);
+ layer_collection_add(sl, &lc->collections, nsc);
}
}
-CollectionBase *collection_base_add(SceneLayer *sl, ListBase *lb, SceneCollection *sc)
+LayerCollection *layer_collection_add(SceneLayer *sl, ListBase *lb, SceneCollection *sc)
{
- CollectionBase *cb = MEM_callocN(sizeof(CollectionBase), "Collection Base");
- BLI_addtail(lb, cb);
+ LayerCollection *lc = MEM_callocN(sizeof(LayerCollection), "Collection Base");
+ BLI_addtail(lb, lc);
- cb->collection = sc;
- cb->flag = COLLECTION_VISIBLE + COLLECTION_SELECTABLE + COLLECTION_FOLDED;
+ lc->collection = sc;
+ lc->flag = COLLECTION_VISIBLE + COLLECTION_SELECTABLE + COLLECTION_FOLDED;
- collection_base_populate(sl, cb, sc);
- return cb;
+ layer_collection_populate(sl, lc, sc);
+ return lc;
}
/* Override */
@@ -216,7 +216,7 @@ CollectionBase *collection_base_add(SceneLayer *sl, ListBase *lb, SceneCollectio
/*
* Add a new datablock override
*/
-void BKE_collection_override_datablock_add(CollectionBase *UNUSED(cb), const char *UNUSED(data_path), ID *UNUSED(id))
+void BKE_collection_override_datablock_add(LayerCollection *UNUSED(lc), const char *UNUSED(data_path), ID *UNUSED(id))
{
TODO_LAYER_OVERRIDE;
}
diff --git a/source/blender/blenloader/intern/versioning_280.c b/source/blender/blenloader/intern/versioning_280.c
index 6b85648..2f3d2d0 100644
--- a/source/blender/blenloader/intern/versioning_280.c
+++ b/source/blender/blenloader/intern/versioning_280.c
@@ -85,7 +85,7 @@ void blo_do_versions_280_after_linking(FileData *fd, Library *UNUSED(lib), Main
BKE_scene_layer_engine_set(sl, scene->r.engine);
if (srl->mat_override) {
- BKE_collection_override_datablock_add((CollectionBase *)sl->collection_bases.first, "material", (ID *)srl->mat_override);
+ BKE_collection_override_datablock_add((LayerCollection *)sl->collections.first, "material", (ID *)srl->mat_override);
}
if (srl->light_override && BKE_scene_uses_blender_internal(scene)) {
@@ -95,7 +95,7 @@ void blo_do_versions_280_after_linking(FileData *fd, Library *UNUSED(lib), Main
if (srl->lay != scene->lay) {
/* unlink master collection */
- BKE_collection_unlink(sl, sl->collection_bases.first);
+ BKE_collection_unlink(sl, sl->collections.first);
/* add new collection bases */
for (int i = 0; i < 20; i++) {
@@ -112,12 +112,12 @@ void blo_do_versions_280_after_linking(FileData *fd, Library *UNUSED(lib), Main
SceneLayer *sl = BKE_scene_layer_add(scene, "Render Layer");
/* In this particular case we can safely assume the data struct */
- CollectionBase *cb = ((CollectionBase *)sl->collection_bases.first)->collection_bases.first;
+ LayerCollection *lc = ((LayerCollection *)sl->collections.first)->collections.first;
for (int i = 0; i < 20; i++) {
if (!is_visible[i]) {
- cb->flag &= ~COLLECTION_VISIBLE;
+ lc->flag &= ~COLLECTION_VISIBLE;
}
- cb = cb->next;
+ lc = lc->next;
}
/* TODO: copy scene render data to layer */
diff --git a/source/blender/makesdna/DNA_layer_types.h b/source/blender/makesdna/DNA_layer_types.h
index 9573379..7707069 100644
--- a/source/blender/makesdna/DNA_layer_types.h
+++ b/source/blender/makesdna/DNA_layer_types.h
@@ -47,15 +47,15 @@ typedef struct CollectionOverride {
/* TODO proper data */
} CollectionOverride;
-typedef struct CollectionBase {
- struct CollectionBase *next, *prev;
+typedef struct LayerCollection {
+ struct LayerCollection *next, *prev;
struct SceneCollection *collection;
short flag;
short pad[3];
- ListBase collection_bases; /* synced with collection->collections */
+ ListBase collections; /* synced with collection->collections */
ListBase object_bases; /* synced with collection->objects and collection->filter_objects */
ListBase overrides;
-} CollectionBase;
+} LayerCollection;
typedef struct SceneCollection {
struct SceneCollection *next, *prev;
@@ -73,7 +73,7 @@ typedef struct SceneLayer {
short active_collection;
short pad[3];
struct ObjectBase *basact;
- ListBase collection_bases;
+ ListBase collections;
ListBase object_bases;
} SceneLayer;
More information about the Bf-blender-cvs
mailing list