[Bf-blender-cvs] [33ee18ad6f] render-layers: rename ob_base > base, it will simplify further refactors
Dalai Felinto
noreply at git.blender.org
Tue Jan 10 17:57:11 CET 2017
Commit: 33ee18ad6f11749ed1a246209a673e177b5c065e
Author: Dalai Felinto
Date: Tue Jan 10 12:45:24 2017 +0100
Branches: render-layers
https://developer.blender.org/rB33ee18ad6f11749ed1a246209a673e177b5c065e
rename ob_base > base, it will simplify further refactors
===================================================================
M source/blender/blenkernel/BKE_layer.h
M source/blender/blenkernel/intern/layer.c
M source/blender/blenkernel/intern/library_query.c
M source/blender/blenkernel/intern/scene.c
M source/blender/blenloader/intern/readfile.c
M source/blender/editors/object/object_relations.c
===================================================================
diff --git a/source/blender/blenkernel/BKE_layer.h b/source/blender/blenkernel/BKE_layer.h
index ddde7b83a9..8122fffaa7 100644
--- a/source/blender/blenkernel/BKE_layer.h
+++ b/source/blender/blenkernel/BKE_layer.h
@@ -99,9 +99,9 @@ void BKE_selected_objects_Iterator_end(Iterator *iter);
#define FOREACH_OBJECT(sl, _ob) \
{ \
- ObjectBase *ob_base; \
- for (ob_base = sl->object_bases.first; ob_base; ob_base = ob_base->next) {\
- _ob = ob_base->object;
+ ObjectBase *base; \
+ for (base = sl->object_bases.first; base; base = base->next) { \
+ _ob = base->object;
#define FOREACH_OBJECT_END \
} \
diff --git a/source/blender/blenkernel/intern/layer.c b/source/blender/blenkernel/intern/layer.c
index 42a1e20be5..5a15390025 100644
--- a/source/blender/blenkernel/intern/layer.c
+++ b/source/blender/blenkernel/intern/layer.c
@@ -124,12 +124,12 @@ void BKE_scene_layer_engine_set(SceneLayer *sl, const char *engine)
*/
void BKE_scene_layer_selected_objects_tag(SceneLayer *sl, const int tag)
{
- for (ObjectBase *ob_base = sl->object_bases.first; ob_base; ob_base = ob_base->next) {
- if ((ob_base->flag & BASE_SELECTED) != 0) {
- ob_base->object->flag |= tag;
+ for (ObjectBase *base = sl->object_bases.first; base; base = base->next) {
+ if ((base->flag & BASE_SELECTED) != 0) {
+ base->object->flag |= tag;
}
else {
- ob_base->object->flag &= ~tag;
+ base->object->flag &= ~tag;
}
}
}
@@ -162,18 +162,18 @@ static void scene_layer_object_base_unref(SceneLayer* sl, ObjectBase *base)
*/
static ObjectBase *object_base_add(SceneLayer *sl, Object *ob)
{
- ObjectBase *ob_base;
- ob_base = BKE_scene_layer_base_find(sl, ob);
+ ObjectBase *base;
+ base = BKE_scene_layer_base_find(sl, ob);
- if (ob_base == NULL) {
- ob_base = MEM_callocN(sizeof(ObjectBase), "Object Base");
+ if (base == NULL) {
+ base = MEM_callocN(sizeof(ObjectBase), "Object Base");
/* do not bump user count, leave it for SceneCollections */
- ob_base->object = ob;
- BLI_addtail(&sl->object_bases, ob_base);
+ base->object = ob;
+ BLI_addtail(&sl->object_bases, base);
}
- ob_base->refcount++;
- return ob_base;
+ base->refcount++;
+ return base;
}
/* LayerCollection */
@@ -314,28 +314,28 @@ void BKE_collection_unlink(SceneLayer *sl, LayerCollection *lc)
static void layer_collection_object_add(SceneLayer *sl, LayerCollection *lc, Object *ob)
{
- ObjectBase *ob_base = object_base_add(sl, ob);
+ ObjectBase *base = object_base_add(sl, ob);
/* only add an object once - prevent SceneCollection->objects and
* SceneCollection->filter_objects to add the same object */
- if (BLI_findptr(&lc->object_bases, ob_base, offsetof(LinkData, data))) {
+ if (BLI_findptr(&lc->object_bases, base, offsetof(LinkData, data))) {
return;
}
- BLI_addtail(&lc->object_bases, BLI_genericNodeN(ob_base));
+ BLI_addtail(&lc->object_bases, BLI_genericNodeN(base));
}
static void layer_collection_object_remove(SceneLayer *sl, LayerCollection *lc, Object *ob)
{
- ObjectBase *ob_base;
- ob_base = BKE_scene_layer_base_find(sl, ob);
+ ObjectBase *base;
+ base = BKE_scene_layer_base_find(sl, ob);
- LinkData *link = BLI_findptr(&lc->object_bases, ob_base, offsetof(LinkData, data));
+ LinkData *link = BLI_findptr(&lc->object_bases, base, offsetof(LinkData, data));
BLI_remlink(&lc->object_bases, link);
MEM_freeN(link);
- scene_layer_object_base_unref(sl, ob_base);
+ scene_layer_object_base_unref(sl, base);
}
static void layer_collection_objects_populate(SceneLayer *sl, LayerCollection *lc, ListBase *objects)
@@ -448,30 +448,30 @@ void BKE_collection_override_datablock_add(LayerCollection *UNUSED(lc), const ch
void BKE_selected_objects_Iterator_begin(Iterator *iter, void *data_in)
{
SceneLayer *sl = data_in;
- ObjectBase *ob_base = sl->object_bases.first;
+ ObjectBase *base = sl->object_bases.first;
iter->valid = true;
- if ((ob_base->flag & BASE_SELECTED) == 0) {
+ if ((base->flag & BASE_SELECTED) == 0) {
BKE_selected_objects_Iterator_next(iter);
}
else {
- iter->current = ob_base->object;
- iter->data = ob_base;
+ iter->current = base->object;
+ iter->data = base;
}
}
void BKE_selected_objects_Iterator_next(Iterator *iter)
{
- ObjectBase *ob_base = ((ObjectBase *)iter->data)->next;
+ ObjectBase *base = ((ObjectBase *)iter->data)->next;
- while (ob_base) {
- if ((ob_base->flag & BASE_SELECTED) != 0) {
- iter->current = ob_base->object;
- iter->data = ob_base;
+ while (base) {
+ if ((base->flag & BASE_SELECTED) != 0) {
+ iter->current = base->object;
+ iter->data = base;
return;
}
- ob_base = ob_base->next;
+ base = base->next;
};
iter->current = NULL;
diff --git a/source/blender/blenkernel/intern/library_query.c b/source/blender/blenkernel/intern/library_query.c
index 58b3557c6c..99aab6daed 100644
--- a/source/blender/blenkernel/intern/library_query.c
+++ b/source/blender/blenkernel/intern/library_query.c
@@ -334,7 +334,7 @@ void BKE_library_foreach_ID_link(ID *id, LibraryIDLinkCallback callback, void *u
Scene *scene = (Scene *) id;
ToolSettings *toolsett = scene->toolsettings;
SceneRenderLayer *srl;
- Base *base;
+ Base *legacy_base;
CALLBACK_INVOKE(scene->camera, IDWALK_NOP);
CALLBACK_INVOKE(scene->world, IDWALK_USER);
@@ -391,8 +391,8 @@ void BKE_library_foreach_ID_link(ID *id, LibraryIDLinkCallback callback, void *u
CALLBACK_INVOKE(scene->gpd, IDWALK_USER);
- for (base = scene->base.first; base; base = base->next) {
- CALLBACK_INVOKE(base->object, IDWALK_USER);
+ for (legacy_base = scene->base.first; legacy_base; legacy_base = legacy_base->next) {
+ CALLBACK_INVOKE(legacy_base->object, IDWALK_USER);
}
SceneCollection *sc;
@@ -410,8 +410,8 @@ void BKE_library_foreach_ID_link(ID *id, LibraryIDLinkCallback callback, void *u
SceneLayer *sl;
for (sl = scene->render_layers.first; sl; sl = sl->next) {
- for (ObjectBase *ob_base = sl->object_bases.first; ob_base; ob_base = ob_base->next) {
- CALLBACK_INVOKE(ob_base->object, IDWALK_NOP);
+ for (ObjectBase *base = sl->object_bases.first; base; base = base->next) {
+ CALLBACK_INVOKE(base->object, IDWALK_NOP);
}
}
diff --git a/source/blender/blenkernel/intern/scene.c b/source/blender/blenkernel/intern/scene.c
index 8054050f59..3a4407ee3e 100644
--- a/source/blender/blenkernel/intern/scene.c
+++ b/source/blender/blenkernel/intern/scene.c
@@ -214,7 +214,7 @@ Scene *BKE_scene_copy(Main *bmain, Scene *sce, int type)
SceneRenderLayer *srl, *new_srl;
FreestyleLineSet *lineset;
ToolSettings *ts;
- Base *base, *obase;
+ Base *legacy_base, *olegacy_base;
if (type == SCE_COPY_EMPTY) {
ListBase rl, rv;
@@ -268,14 +268,14 @@ Scene *BKE_scene_copy(Main *bmain, Scene *sce, int type)
BKE_libblock_relink_ex(bmain, scen->nodetree, &sce->id, &scen->id, false);
}
- obase = sce->base.first;
- base = scen->base.first;
- while (base) {
- id_us_plus(&base->object->id);
- if (obase == sce->basact) scen->basact = base;
+ olegacy_base = sce->base.first;
+ legacy_base = scen->base.first;
+ while (legacy_base) {
+ id_us_plus(&legacy_base->object->id);
+ if (olegacy_base == sce->basact) scen->basact = legacy_base;
- obase = obase->next;
- base = base->next;
+ olegacy_base = olegacy_base->next;
+ legacy_base = legacy_base->next;
}
/* copy action and remove animation used by sequencer */
@@ -319,9 +319,9 @@ Scene *BKE_scene_copy(Main *bmain, Scene *sce, int type)
if (sl->basact) {
Object *active_ob = sl->basact->object;
- for (ObjectBase *ob_base = new_sl->object_bases.first; ob_base; ob_base = ob_base->next) {
- if (ob_base->object == active_ob) {
- new_sl->basact = ob_base;
+ for (ObjectBase *base = new_sl->object_bases.first; base; base = base->next) {
+ if (base->object == active_ob) {
+ new_sl->basact = base;
break;
}
}
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c
index 5a82d013de..0f79a42111 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -5645,7 +5645,7 @@ static void lib_link_scene_collection(FileData *fd, Library *lib, SceneCollectio
static void lib_link_scene(FileData *fd, Main *main)
{
Scene *sce;
- Base *base, *next;
+ Base *base_legacy, *base_legacy_next;
Sequence *seq;
SceneLayer *sl;
SceneRenderLayer *srl;
@@ -5697,17 +5697,17 @@ static void lib_link_scene(FileData *fd, Main *main)
sce->toolsettings->particle.shape_object = newlibadr(fd, sce->id.lib, sce->toolsettings->particle.shape_object);
- for (base = sce->base.first; base; base = next) {
- next = base->next;
+ for (base_legacy = sce->base.first; base_legacy; base_legacy = base_legacy_next) {
+ base_legacy_next = base_legacy->next;
- base->object = newlibadr_us(fd, sce->id.lib, base->object);
+ base_legacy->object = newlibadr_us(fd, sce->id.lib, base_legacy->object);
- if (base->object == NULL) {
+ if (base_legacy->object == NULL) {
blo_reportf_wrap(fd->reports, RPT_WARNING, TIP_("LIB: object lost from scene: '%s'"),
sce->id.name + 2);
- BLI_remlink(&sce->base, base);
- if (base == sce->basact) sce->basact = NULL;
- MEM_freeN(base);
+ BLI_remlink(&sce->base, base_legacy);
+ if (base_legacy == sce->basact) sce->basact = NULL;
+ MEM_freeN(base_legacy);
}
}
@@ -5796,9 +5796,9 @@ static void lib_link_scene(FileData *fd, Main *main)
lib_link_scene_collection(fd, sce->id.lib, sce->collection);
for (sl = sce->render_layers.first; sl; sl = sl->next) {
- for (ObjectBase *ob_base = sl->object_bases.first; ob_base; ob_base = ob_base->next) {
+ for (ObjectBase *base = sl->object_bases.first; base
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list