Base refactor 4/4

Rebase ObjectBase > Base

43 files changed, 167 insertions, 174 deletions

diff --git a/source/blender/blenkernel/BKE_collection.h b/source/blender/blenkernel/BKE_collection.h
index 47f70012bdb..c3f461dacd6 100644
--- a/source/blender/blenkernel/BKE_collection.h
+++ b/source/blender/blenkernel/BKE_collection.h
@@ -38,7 +38,7 @@ extern "C" {
 struct Iterator;
 struct SceneCollection;
 struct Object;
-struct ObjectBase;
+struct Base;
 struct Main;
 struct Scene;
 
diff --git a/source/blender/blenkernel/BKE_context.h b/source/blender/blenkernel/BKE_context.h
index 2fd11746fb0..23f9ff28f8b 100644
--- a/source/blender/blenkernel/BKE_context.h
+++ b/source/blender/blenkernel/BKE_context.h
@@ -44,7 +44,7 @@ struct LayerCollection;
 struct ListBase;
 struct Main;
 struct Object;
-struct ObjectBase;
+struct Base;
 struct PointerRNA;
 struct ReportList;
 struct Scene;
@@ -271,7 +271,7 @@ int CTX_data_selectable_objects(const bContext *C, ListBase *list);
 int CTX_data_selectable_bases(const bContext *C, ListBase *list);
 
 struct Object *CTX_data_active_object(const bContext *C);
-struct ObjectBase *CTX_data_active_base(const bContext *C);
+struct Base *CTX_data_active_base(const bContext *C);
 struct Object *CTX_data_edit_object(const bContext *C);
 
 struct Image *CTX_data_edit_image(const bContext *C);
diff --git a/source/blender/blenkernel/BKE_group.h b/source/blender/blenkernel/BKE_group.h
index 23a49b3016a..f718e9c8555 100644
--- a/source/blender/blenkernel/BKE_group.h
+++ b/source/blender/blenkernel/BKE_group.h
@@ -34,7 +34,7 @@
  */
 
 struct BaseLegacy;
-struct ObjectBase;
+struct Base;
 struct EvaluationContext;
 struct Group;
 struct Main;
diff --git a/source/blender/blenkernel/BKE_layer.h b/source/blender/blenkernel/BKE_layer.h
index 30c9e217272..de8a577d272 100644
--- a/source/blender/blenkernel/BKE_layer.h
+++ b/source/blender/blenkernel/BKE_layer.h
@@ -37,7 +37,7 @@ extern "C" {
 #define TODO_LAYER_SYNC_FILTER /* syncing of filter_objects across all trees */
 #define TODO_LAYER_OVERRIDE /* CollectionOverride */
 #define TODO_LAYER_CONTEXT /* get/set current (context) SceneLayer */
-#define TODO_LAYER_BASE /* Base to ObjectBase related TODO */
+#define TODO_LAYER_BASE /* BaseLegacy to Base related TODO */
 #define TODO_LAYER_OPERATORS /* collection mamanger and property panel operators */
 #define TODO_LAYER_DEPSGRAPH /* placeholder for real Depsgraph fix */
 #define TODO_LAYER /* generic todo */
@@ -48,7 +48,7 @@ struct ID;
 struct ListBase;
 struct Main;
 struct Object;
-struct ObjectBase;
+struct Base;
 struct RenderEngine;
 struct Scene;
 struct SceneCollection;
@@ -65,9 +65,9 @@ void BKE_scene_layer_engine_set(struct SceneLayer *sl, const char *engine);
 void BKE_scene_layer_selected_objects_tag(struct SceneLayer *sl, const int tag);
 
 struct SceneLayer *BKE_scene_layer_find_from_collection(struct Scene *scene, struct LayerCollection *lc);
-struct ObjectBase *BKE_scene_layer_base_find(struct SceneLayer *sl, struct Object *ob);
+struct Base *BKE_scene_layer_base_find(struct SceneLayer *sl, struct Object *ob);
 void BKE_scene_layer_base_deselect_all(struct SceneLayer *sl);
-void BKE_scene_layer_base_select(struct SceneLayer *sl, struct ObjectBase *selbase);
+void BKE_scene_layer_base_select(struct SceneLayer *sl, struct Base *selbase);
 void BKE_scene_layer_base_flag_recalculate(struct SceneLayer *sl);
 
 void BKE_scene_layer_engine_settings_recalculate(struct SceneLayer *sl);
@@ -161,7 +161,7 @@ void BKE_visible_bases_Iterator_end(Iterator *iter);
 
 #define FOREACH_OBJECT(sl, _ob)                                               \
 {                                                                             \
-	ObjectBase *base;                                                         \
+	Base *base;                                                               \
 	for (base = sl->object_bases.first; base; base = base->next) {            \
 	    _ob = base->object;
 
@@ -201,7 +201,7 @@ void BKE_visible_bases_Iterator_end(Iterator *iter);
 	BKE_scene_layer_engine_settings_update(sl);                               \
 	                                                                          \
 	/* flush all the data to objects*/                                        \
-	ObjectBase *base_;					                                      \
+	Base *base_;                                                              \
 	for (base_ = sl->object_bases.first; base_; base_ = base_->next) {        \
 	    ob_ = base_->object;			                                      \
 	    ob_->base_flag = base_->flag;
diff --git a/source/blender/blenkernel/BKE_scene.h b/source/blender/blenkernel/BKE_scene.h
index d4b11507d12..53bb69aedb6 100644
--- a/source/blender/blenkernel/BKE_scene.h
+++ b/source/blender/blenkernel/BKE_scene.h
@@ -42,7 +42,7 @@ struct BaseLegacy;
 struct EvaluationContext;
 struct Main;
 struct Object;
-struct ObjectBase;
+struct Base;
 struct QuicktimeCodecData;
 struct RenderData;
 struct SceneRenderLayer;
@@ -99,8 +99,8 @@ void BKE_scene_base_flag_to_objects(struct Scene *scene);
 void BKE_scene_base_flag_from_objects(struct Scene *scene);
 void BKE_scene_base_flag_sync_from_base(struct BaseLegacy *base);
 void BKE_scene_base_flag_sync_from_object(struct BaseLegacy *base);
-void BKE_scene_object_base_flag_sync_from_base(struct ObjectBase *base);
-void BKE_scene_object_base_flag_sync_from_object(struct ObjectBase *base);
+void BKE_scene_object_base_flag_sync_from_base(struct Base *base);
+void BKE_scene_object_base_flag_sync_from_object(struct Base *base);
 
 void BKE_scene_set_background(struct Main *bmain, struct Scene *sce);
 struct Scene *BKE_scene_set_name(struct Main *bmain, const char *name);
diff --git a/source/blender/blenkernel/intern/context.c b/source/blender/blenkernel/intern/context.c
index afc4a397d07..1cbf8cf01c8 100644
--- a/source/blender/blenkernel/intern/context.c
+++ b/source/blender/blenkernel/intern/context.c
@@ -1100,7 +1100,7 @@ struct Object *CTX_data_active_object(const bContext *C)
 	return ctx_data_pointer_get(C, "active_object");
 }
 
-struct ObjectBase *CTX_data_active_base(const bContext *C)
+struct Base *CTX_data_active_base(const bContext *C)
 {
 	return ctx_data_pointer_get(C, "active_base");
 }
diff --git a/source/blender/blenkernel/intern/layer.c b/source/blender/blenkernel/intern/layer.c
index 8d0314bd89c..28c5e9aff5d 100644
--- a/source/blender/blenkernel/intern/layer.c
+++ b/source/blender/blenkernel/intern/layer.c
@@ -138,7 +138,7 @@ 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 *base = sl->object_bases.first; base; base = base->next) {
+	for (Base *base = sl->object_bases.first; base; base = base->next) {
 		if ((base->flag & BASE_SELECTED) != 0) {
 			base->object->flag |= tag;
 		}
@@ -174,23 +174,23 @@ SceneLayer *BKE_scene_layer_find_from_collection(Scene *scene, LayerCollection *
 	return NULL;
 }
 
-/* ObjectBase */
+/* Base */
 
-ObjectBase *BKE_scene_layer_base_find(SceneLayer *sl, Object *ob)
+Base *BKE_scene_layer_base_find(SceneLayer *sl, Object *ob)
 {
-	return BLI_findptr(&sl->object_bases, ob, offsetof(ObjectBase, object));
+	return BLI_findptr(&sl->object_bases, ob, offsetof(Base, object));
 }
 
 void BKE_scene_layer_base_deselect_all(SceneLayer *sl)
 {
-	ObjectBase *base;
+	Base *base;
 
 	for (base = sl->object_bases.first; base; base = base->next) {
 		base->flag &= ~BASE_SELECTED;
 	}
 }
 
-void BKE_scene_layer_base_select(struct SceneLayer *sl, ObjectBase *selbase)
+void BKE_scene_layer_base_select(struct SceneLayer *sl, Base *selbase)
 {
 	sl->basact = selbase;
 	if ((selbase->flag & BASE_SELECTABLED) != 0) {
@@ -198,7 +198,7 @@ void BKE_scene_layer_base_select(struct SceneLayer *sl, ObjectBase *selbase)
 	}
 }
 
-static void scene_layer_object_base_unref(SceneLayer* sl, ObjectBase *base)
+static void scene_layer_object_base_unref(SceneLayer* sl, Base *base)
 {
 	base->refcount--;
 
@@ -220,7 +220,7 @@ static void layer_collection_base_flag_recalculate(LayerCollection *lc, const bo
 	bool is_selectable = tree_is_selectable && is_visible && ((lc->flag & COLLECTION_SELECTABLE) != 0);
 
 	for (LinkData *link = lc->object_bases.first; link; link = link->next) {
-		ObjectBase *base = link->data;
+		Base *base = link->data;
 
 		if (is_visible) {
 			base->flag |= BASE_VISIBLED;
@@ -252,7 +252,7 @@ void BKE_scene_layer_base_flag_recalculate(SceneLayer *sl)
 	}
 
 	/* if base is not selectabled, clear select */
-	for (ObjectBase *base = sl->object_bases.first; base; base = base->next) {
+	for (Base *base = sl->object_bases.first; base; base = base->next) {
 		if ((base->flag & BASE_SELECTABLED) == 0) {
 			base->flag &= ~BASE_SELECTED;
 		}
@@ -292,13 +292,13 @@ void BKE_scene_layer_engine_settings_update(struct SceneLayer *sl)
  * Return the base if existent, or create it if necessary
  * Always bump the refcount
  */
-static ObjectBase *object_base_add(SceneLayer *sl, Object *ob)
+static Base *object_base_add(SceneLayer *sl, Object *ob)
 {
-	ObjectBase *base;
+	Base *base;
 	base = BKE_scene_layer_base_find(sl, ob);
 
 	if (base == NULL) {
-		base = MEM_callocN(sizeof(ObjectBase), "Object Base");
+		base = MEM_callocN(sizeof(Base), "Object Base");
 
 		/* do not bump user count, leave it for SceneCollections */
 		base->object = ob;
@@ -450,7 +450,7 @@ void BKE_collection_unlink(SceneLayer *sl, LayerCollection *lc)
 
 static void layer_collection_object_add(SceneLayer *sl, LayerCollection *lc, Object *ob)
 {
-	ObjectBase *base = object_base_add(sl, ob);
+	Base *base = object_base_add(sl, ob);
 
 	/* only add an object once - prevent SceneCollection->objects and
 	 * SceneCollection->filter_objects to add the same object */
@@ -466,7 +466,7 @@ static void layer_collection_object_add(SceneLayer *sl, LayerCollection *lc, Obj
 
 static void layer_collection_object_remove(SceneLayer *sl, LayerCollection *lc, Object *ob)
 {
-	ObjectBase *base;
+	Base *base;
 	base = BKE_scene_layer_base_find(sl, ob);
 
 	LinkData *link = BLI_findptr(&lc->object_bases, base, offsetof(LinkData, data));
@@ -528,7 +528,7 @@ bool BKE_scene_layer_has_collection(struct SceneLayer *sl, struct SceneCollectio
 bool BKE_scene_has_object(Scene *scene, Object *ob)
 {
 	for (SceneLayer *sl = scene->render_layers.first; sl; sl = sl->next) {
-		ObjectBase *base = BKE_scene_layer_base_find(sl, ob);
+		Base *base = BKE_scene_layer_base_find(sl, ob);
 		if (base) {
 			return true;
 		}
@@ -824,7 +824,7 @@ void BKE_collection_engine_property_use_set(CollectionEngineSettings *ces, const
 static void object_bases_Iterator_begin(Iterator *iter, void *data_in, const int flag)
 {
 	SceneLayer *sl = data_in;
-	ObjectBase *base = sl->object_bases.first;
+	Base *base = sl->object_bases.first;
 
 	/* when there are no objects */
 	if (base ==  NULL) {
@@ -845,7 +845,7 @@ static void object_bases_Iterator_begin(Iterator *iter, void *data_in, const int
 
 static void object_bases_Iterator_next(Iterator *iter, const int flag)
 {
-	ObjectBase *base = ((ObjectBase *)iter->data)->next;
+	Base *base = ((Base *)iter->data)->next;
 
 	while (base) {
 		if ((base->flag & flag) != 0) {
@@ -865,7 +865,7 @@ static void objects_Iterator_begin(Iterator *iter, void *data_in, const int flag
 	object_bases_Iterator_begin(iter, data_in, flag);
 
 	if (iter->valid) {
-		iter->current = ((ObjectBase *)iter->current)->object;
+		iter->current = ((Base *)iter->current)->object;
 	}
 }
 
@@ -874,7 +874,7 @@ static void objects_Iterator_next(Iterator *iter, const int flag)
 	object_bases_Iterator_next(iter, flag);
 
 	if (iter->valid) {
-		iter->current = ((ObjectBase *)iter->current)->object;
+		iter->current = ((Base *)iter->current)->object;
 	}
 }
 
diff --git a/source/blender/blenkernel/intern/library_query.c b/source/blender/blenkernel/intern/library_query.c
index 7c9e4058a1e..a071b3202be 100644
--- a/source/blender/blenkernel/intern/library_query.c
+++ b/source/blender/blenkernel/intern/library_query.c
@@ -431,7 +431,7 @@ void BKE_library_foreach_ID_link(Main *bmain, ID *id, LibraryIDLinkCallback call
 
 				SceneLayer *sl;
 				for (sl = scene->render_layers.first; sl; sl = sl->next) {
-					for (ObjectBase *base = sl->object_bases.first; base; base = base->next) {
+					for (Base *base = sl->object_bases.first; base; base = base->next) {
 						CALLBACK_INVOKE(base->object, IDWALK_NOP);
 					}
 				}
diff --git a/source/blender/blenkernel/intern/mball.c b/source/blender/blenkernel/intern/mball.c
index 221ae2fae8a..2632acea58b 100644
--- a/source/blender/blenkernel/intern/mball.c
+++ b/source/blender/blenkernel/intern/mball.c
@@ -366,7 +366,7 @@ Object *BKE_mball_basis_find(Scene *scene, Object *basis)
 	BLI_split_name_num(basisname, &basisnr, basis->id.name + 2, '.');
 
 	for (SceneLayer *sl = scene->render_layers.first; sl; sl = sl->next) {
-		for (ObjectBase *base = sl->object_bases.first; base; base = base->next) {
+		for (Base *base = sl->object_bases.first; base; base = base->next) {
 			Object *ob = base->object;
 			if ((ob->type == OB_MBALL) && !(base->flag & OB_FROMDUPLI)) {
 				if (ob != bob) {
diff --git a/source/blender/blenkernel/intern/object.c b/source/blender/blenkernel/intern/object.c
index 2bd3eca900f..08cb9e57ab4 100644
--- a/source/blender/blenkernel/intern/object.c
+++ b/source/blender/blenkernel/intern/object.c
@@ -682,7 +682,7 @@ Object *BKE_object_add(
         int type, const char *name)
 {
 	Object *ob;
-	ObjectBase *base;
+	Base *base;
 	LayerCollection *lc;
 
 	ob = BKE_object_add_only_object(bmain, type, name);
diff --git a/source/blender/blenkernel/intern/scene.c b/source/blender/blenkernel/intern/scene.c
index 961651f3b08..1ce4bf8f9eb 100644
--- a/source/blender/blenkernel/intern/scene.c
+++ b/source/blender/blenkernel/intern/scene.c
@@ -321,7 +321,7 @@ Scene *BKE_scene_copy(Main *bmain, Scene *sce, int type)
 
 			if (sl->basact) {
 				Object *active_ob = sl->basact->object;
-				for (ObjectBase *base = new_sl->object_bases.first; base; base = base->next) {
+				for (Base *base = new_sl->object_bases.first; base; base = base->next) {
 					if (base->object == active_ob) {
 						new_sl->basact = base;
 						break;
@@ -1782,7 +1782,7 @@ void BKE_scene_base_flag_sync_from_object(BaseLegacy *base)
 	base->flag_legacy = base->object->flag;
 }
 
-void BKE_scene_object_base_flag_sync_from_base(ObjectBase *base)
+void BKE_scene_object_base_flag_sync_from_base(Base *base)
 {
 	Object *ob = base->object;
 
@@ -1793,7 +1793,7 @@ void BKE_scene_object_base_flag_sync_from_base(ObjectBase *base)
 	ob->flag |= flag;
 }
 
-void BKE_scene_object_base_flag_sync_from_object(ObjectBase *base)
+void BKE_scene_object_base_flag_sync_from_object(Base *base)
 {
 	base->flag = base->object->flag;
 }
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c
index 699f406fb75..da0650d02f5 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -5811,7 +5811,7 @@ 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 *base = sl->object_bases.first; base; base = base->next) {
+				for (Base *base = sl->object_bases.first; base; base = base->next) {
 					/* we only bump the use count for the collection objects */
 					base->object = newlibadr(fd, sce->id.lib, base->object);
 				}
diff --git a/source/blender/blenloader/intern/versioning_280.c b/source/blender/blenloader/intern/versioning_280.c
index 9da9fb3a575..89ee05ee3e7 100644
--- a/source/blender/blenloader/intern/versioning_280.c
+++ b/source/blender/blenloader/intern/versioning_280.c
@@ -137,7 +137,7 @@ void do_versions_after_linking_280(Main *main)
 
 				/* convert selected bases */
 				for (BaseLegacy *base = scene->base.first; base; base = base->next) {
-					ObjectBase *ob_base = BKE_scene_layer_base_find(sl, base->object);
+					Base *ob_base = BKE_scene_layer_base_find(sl, base->object);
 					if ((base->flag_legacy & SELECT) != 0) {
 						if ((ob_base->flag & BASE_SELECTABLED) != 0) {
 							ob_base->flag |= BASE_SELECTED;
diff --git a/source/blender/blenloader/intern/writefile.c b/source/blender/blenloader/intern/writefile.c
index e6bee7d5a21..0ad879b9aa6 100644
--- a/source/blender/blenloader/intern/writefile.c
+++ b/source/blender/blenloader/intern/writefile.c
@@ -2932,7 +2932,7 @@ static void write_scenes(WriteData *wd, ListBase *scebase)
 
 		for (sl = sce->render_layers.first; sl; sl = sl->next) {
 			writestruct(wd, DATA, SceneLayer, 1, sl);
-			writelist(wd, DATA, ObjectBase, &sl->object_bases);
+			writelist(wd, DATA, Base, &sl->object_bases);
 			write_layer_collections(wd, &sl->layer_collections);
 		}
 
diff --git a/source/blender/editors/armature/armature_relations.c b/source/blender/editors/armature/armature_relations.c
index c913669a133..0dc97483dfc 100644
--- a/source/blender/editors/armature/armature_relations.c
+++ b/source/blender/editors/armature/armature_relations.c
@@ -269,7 +269,7 @@ int join_armature_exec(bContext *C, wmOperator *op)
 	if (!arm || arm->edbo)
 		return OPERATOR_CANCELLED;
 	
-	CTX_DATA_BEGIN(C, ObjectBase *, base, selected_editable_bases)
+	CTX_DATA_BEGIN(C, Base *, base, selected_editable_bases)
 	{
 		if (base->object == ob) {
 			ok = true;
@@ -291,7 +291,7 @@ int join_armature_exec(bContext *C, wmOperator *op)
 	pose = ob->pose;
 	ob->mode &= ~OB_MODE_POSE;
 
-	CTX_DATA_BEGIN(C, ObjectBase *, base, selected_editable_bases)
+	CTX_DATA_BEGIN(C, Base *, base, selected_editable_bases)
 	{
 		if ((base->object->type == OB_ARMATURE) && (base->object != ob)) {
 			tJoinArmature_AdtFixData afd = {NULL};
@@ -583,7 +583,7 @@ static int separate_armature_exec(bContext *C, wmOperator *op)
 	SceneLayer *sl = CTX_data_scene_layer(C);
 	Object *obedit = CTX_data_edit_object(C);
 	Object *oldob, *newob;
-	ObjectBase *oldbase, *newbase;
+	Base *oldbase, *newbase;
 	
 	/* sanity checks */
 	if (obedit == NULL)
@@ -602,7 +602,7 @@ static int separate_armature_exec(bContext *C, wmOperator *op)
 
 	/* 1) only edit-base selected */
 	/* TODO: use context iterators for this? */
-	CTX_DATA_BEGIN(C, ObjectBase *, base, visible_bases)
+	CTX_DATA_BEGIN(C, Base *, base, visible_bases)
 	{
 		if (base->object == obedit) {
 			ED_object_base_select(base, BA_SELECT);
diff --git a/source/blender/editors/armature/editarmature_retarget.c b/source/blender/editors/armature/editarmature_retarget.c
index a81f0f9d67d..fa7bf6e7ad4 100644
--- a/source/blender/editors/armature/editarmature_retarget.c
+++ b/source/blender/editors/armature/editarmature_retarget.c
@@ -2518,7 +2518,7 @@ void BIF_retargetArmature(bContext *C)
 	
 	printf("Reeb Graph created\n");
 
-	CTX_DATA_BEGIN (C, ObjectBase *, base, selected_editable_bases)
+	CTX_DATA_BEGIN (C, Base *, base, selected_editable_bases)
 	{
 		Object *ob = base->object;
 
diff --git a/source/blender/editors/armature/pose_edit.c b/source/blender/editors/armature/pose_edit.c
index d54da7830d4..86b7271bfff 100644
--- a/source/blender/editors/armature/pose_edit.c
+++ b/source/blender/editors/armature/pose_edit.c
@@ -81,7 +81,7 @@ Object *ED_pose_object_from_context(bContext *C)
 }
 
 /* This function is used to process the necessary updates for */
-void ED_armature_enter_posemode(bContext *C, ObjectBase *base)
+void ED_armature_enter_posemode(bContext *C, Base *base)
 {
 	ReportList *reports = CTX_wm_reports(C);
 	Object *ob = base->object;
@@ -107,7 +107,7 @@ void ED_armature_enter_posemode(bContext *C, ObjectBase *base)
 	//ED_object_toggle_modes(C, ob->mode);
 }
 
-void ED_armature_exit_posemode(bContext *C, ObjectBase *base)
+void ED_armature_exit_posemode(bContext *C, Base *base)
 {
 	if (base) {
 		Object *ob = base->object;
diff --git a/source/blender/editors/curve/editcurve.c b/source/blender/editors/curve/editcurve.c
index cd153b2855c..6b5a5d81d32 100644
--- a/source/blender/editors/curve/editcurve.c
+++ b/source/blender/editors/curve/editcurve.c
@@ -1273,7 +1273,7 @@ static int separate_exec(bContext *C, wmOperator *op)
 	Scene *scene = CTX_data_scene(C);
 	SceneLayer *sl = CTX_data_scene_layer(C);
 	Object *oldob, *newob;
-	ObjectBase *oldbase, *newbase;
+	Base *oldbase, *newbase;
 	Curve *oldcu, *newcu;
 	EditNurb *newedit;
 	ListBase newnurb = {NULL, NULL};
@@ -5963,7 +5963,7 @@ int join_curve_exec(bContext *C, wmOperator *op)
 	int a;
 	bool ok = false;
 
-	CTX_DATA_BEGIN(C, ObjectBase *, base, selected_editable_bases)
+	CTX_DATA_BEGIN(C, Base *, base, selected_editable_bases)
 	{
 		if (base->object == ob) {
 			ok = true;
@@ -5983,7 +5983,7 @@ int join_curve_exec(bContext *C, wmOperator *op)
 	/* trasnform all selected curves inverse in obact */
 	invert_m4_m4(imat, ob->obmat);
 	
-	CTX_DATA_BEGIN(C, ObjectBase *, base, selected_editable_bases)
+	CTX_DATA_BEGIN(C, Base *, base, selected_editable_bases)
 	{
 		if (base->object->type == ob->type) {
 			if (base->object != ob) {
diff --git a/source/blender/editors/curve/editfont.c b/source/blender/editors/curve/editfont.c
index aee236fa3ff..d86091aaa77 100644
--- a/source/blender/editors/curve/editfont.c
+++ b/source/blender/editors/curve/editfont.c
@@ -423,7 +423,7 @@ static void txt_add_object(bContext *C, TextLine *firstline, int totline, const
 	SceneLayer *sl = CTX_data_scene_layer(C);
 	Curve *cu;
 	Object *obedit;
-	ObjectBase *base;
+	Base *base;
 	struct TextLine *tmp;
 	int nchars = 0, nbytes = 0;
 	char *s;
diff --git a/source/blender/editors/include/ED_armature.h b/source/blender/editors/include/ED_armature.h
index 993b7e56935..3bde01a1bdd 100644
--- a/source/blender/editors/include/ED_armature.h
+++ b/source/blender/editors/include/ED_armature.h
@@ -44,7 +44,7 @@ struct ListBase;
 struct MeshDeformModifierData;
 struct DerivedMesh;
 struct Object;
-struct ObjectBase;
+struct Base;
 struct ReportList;
 struct Scene;
 struct ViewContext;
@@ -184,8 +184,8 @@ void ED_armature_ebone_selectflag_enable(EditBone *ebone, int flag);
 void ED_armature_ebone_selectflag_disable(EditBone *ebone, int flag);
 
 /* poseobject.c */
-void ED_armature_exit_posemode(struct bContext *C, struct ObjectBase *base);
-void ED_armature_enter_posemode(struct bContext *C, struct ObjectBase *base);
+void ED_armature_exit_posemode(struct bContext *C, struct Base *base);
+void ED_armature_enter_posemode(struct bContext *C, struct Base *base);
 void ED_pose_de_selectall(struct Object *ob, int select_mode, const bool ignore_visibility);
 void ED_pose_bone_select(struct Object *ob, struct bPoseChannel *pchan, bool select);
 void ED_pose_recalculate_paths(struct Scene *scene, struct Object *ob);
diff --git a/source/blender/editors/include/ED_object.h b/source/blender/editors/include/ED_object.h
index ca28b3ad184..4d79a42e64e 100644
--- a/source/blender/editors/include/ED_object.h
+++ b/source/blender/editors/include/ED_object.h
@@ -41,7 +41,7 @@ struct ID;
 struct Main;
 struct ModifierData;
 struct Object;
-struct ObjectBase;
+struct Base;
 struct ReportList;
 struct Scene;
 struct SceneLayer;
@@ -104,8 +104,8 @@ void ED_base_object_select(struct BaseLegacy *base, short mode);
 /* includes notifier */
 void ED_base_object_activate(struct bContext *C, struct BaseLegacy *base);
 
-void ED_object_base_select(struct ObjectBase *base, short mode);
-void ED_object_base_activate(struct bContext *C, struct ObjectBase *base);
+void ED_object_base_select(struct Base *base, short mode);
+void ED_object_base_activate(struct bContext *C, struct Base *base);
 
 void ED_base_object_free_and_unlink(struct Main *bmain, struct Scene *scene, struct Object *ob);
 
@@ -113,7 +113,7 @@ void ED_base_object_sync_from_base(struct BaseLegacy *base, struct Object *ob);
 void ED_base_object_sync_from_object(struct BaseLegacy *base, struct Object *ob);
 
 /* single object duplicate, if (dupflag == 0), fully linked, else it uses the flags given */
-struct ObjectBase *ED_object_add_duplicate(struct Main *bmain, struct Scene *scene, struct SceneLayer *sl, struct ObjectBase *base, int dupflag);
+struct Base *ED_object_add_duplicate(struct Main *bmain, struct Scene *scene, struct SceneLayer *sl, struct Base *base, int dupflag);
 
 void ED_object_parent(struct Object *ob, struct Object *parent, const int type, const char *substr);
 
@@ -134,7 +134,7 @@ bool ED_object_editmode_calc_active_center(struct Object *obedit, const bool sel
 
 void ED_object_location_from_view(struct bContext *C, float loc[3]);
 void ED_object_rotation_from_view(struct bContext *C, float rot[3], const char align_axis);
-void ED_object_base_init_transform(struct bContext *C, struct ObjectBase *base, const float loc[3], const float rot[3]);
+void ED_object_base_init_transform(struct bContext *C, struct Base *base, const float loc[3], const float rot[3]);
 float ED_object_new_primitive_matrix(
         struct bContext *C, struct Object *editob,
         const float loc[3], const float rot[3], float primmat[4][4]);
diff --git a/source/blender/editors/mesh/editmesh_tools.c b/source/blender/editors/mesh/editmesh_tools.c
index 445c5e42b2b..549bcd4c4b6 100644
--- a/source/blender/editors/mesh/editmesh_tools.c
+++ b/source/blender/editors/mesh/editmesh_tools.c
@@ -3011,9 +3011,9 @@ enum {
 	MESH_SEPARATE_LOOSE    = 2,
 };
 
-static ObjectBase *mesh_separate_tagged(Main *bmain, Scene *scene, SceneLayer *sl, ObjectBase *base_old, BMesh *bm_old)
+static Base *mesh_separate_tagged(Main *bmain, Scene *scene, SceneLayer *sl, Base *base_old, BMesh *bm_old)
 {
-	ObjectBase *base_new;
+	Base *base_new;
 	Object *obedit = base_old->object;
 	BMesh *bm_new;
 
@@ -3058,7 +3058,7 @@ static ObjectBase *mesh_separate_tagged(Main *bmain, Scene *scene, SceneLayer *s
 	return base_new;
 }
 
-static bool mesh_separate_selected(Main *bmain, Scene *scene, SceneLayer *sl, ObjectBase *base_old, BMesh *bm_old)
+static bool mesh_separate_selected(Main *bmain, Scene *scene, SceneLayer *sl, Base *base_old, BMesh *bm_old)
 {
 	/* we may have tags from previous operators */
 	BM_mesh_elem_hflag_disable_all(bm_old, BM_FACE | BM_EDGE | BM_VERT, BM_ELEM_TAG, false);
@@ -3165,14 +3165,14 @@ static void mesh_separate_material_assign_mat_nr(Main *bmain, Object *ob, const
 	}
 }
 
-static bool mesh_separate_material(Main *bmain, Scene *scene, SceneLayer *sl, ObjectBase *base_old, BMesh *bm_old)
+static bool mesh_separate_material(Main *bmain, Scene *scene, SceneLayer *sl, Base *base_old, BMesh *bm_old)
 {
 	BMFace *f_cmp, *f;
 	BMIter iter;
 	bool result = false;
 
 	while ((f_cmp = BM_iter_at_index(bm_old, BM_FACES_OF_MESH, NULL, 0))) {
-		ObjectBase *base_new;
+		Base *base_new;
 		const short mat_nr = f_cmp->mat_nr;
 		int tot = 0;
 
@@ -3217,7 +3217,7 @@ static bool mesh_separate_material(Main *bmain, Scene *scene, SceneLayer *sl, Ob
 	return result;
 }
 
-static bool mesh_separate_loose(Main *bmain, Scene *scene, SceneLayer *sl, ObjectBase *base_old, BMesh *bm_old)
+static bool mesh_separate_loose(Main *bmain, Scene *scene, SceneLayer *sl, Base *base_old, BMesh *bm_old)
 {
 	int i;
 	BMEdge *e;
@@ -3285,7 +3285,7 @@ static int edbm_separate_exec(bContext *C, wmOperator *op)
 	int retval = 0;
 	
 	if (ED_operator_editmesh(C)) {
-		ObjectBase *base = CTX_data_active_base(C);
+		Base *base = CTX_data_active_base(C);
 		BMEditMesh *em = BKE_editmesh_from_object(base->object);
 
 		if (type == 0) {
@@ -3325,7 +3325,7 @@ static int edbm_separate_exec(bContext *C, wmOperator *op)
 		}
 
 		/* object mode separate */
-		CTX_DATA_BEGIN(C, ObjectBase *, base_iter, selected_editable_bases)
+		CTX_DATA_BEGIN(C, Base *, base_iter, selected_editable_bases)
 		{
 			Object *ob = base_iter->object;
 			if (ob->type == OB_MESH) {
diff --git a/source/blender/editors/mesh/mesh_navmesh.c b/source/blender/editors/mesh/mesh_navmesh.c
index 300cac8aa37..443f2f0baa8 100644
--- a/source/blender/editors/mesh/mesh_navmesh.c
+++ b/source/blender/editors/mesh/mesh_navmesh.c
@@ -465,7 +465,7 @@ static int navmesh_create_exec(bContext *C, wmOperator *op)
 	LinkNode *obs = NULL;
 	BaseLegacy *navmeshBase = NULL;
 
-	CTX_DATA_BEGIN (C, ObjectBase *, base, selected_editable_bases)
+	CTX_DATA_BEGIN (C, Base *, base, selected_editable_bases)
 	{
 		if (base->object->type == OB_MESH) {
 			if (base->object->body_type == OB_BODY_TYPE_NAVMESH) {
diff --git a/source/blender/editors/mesh/meshtools.c b/source/blender/editors/mesh/meshtools.c
index d34941efb72..c8b0955c70f 100644
--- a/source/blender/editors/mesh/meshtools.c
+++ b/source/blender/editors/mesh/meshtools.c
@@ -77,7 +77,7 @@
 
 static void join_mesh_single(
         Main *bmain, Scene *scene,
-        Object *ob_dst, ObjectBase *base_src, float imat[4][4],
+        Object *ob_dst, Base *base_src, float imat[4][4],
         MVert **mvert_pp, MEdge **medge_pp, MLoop **mloop_pp, MPoly **mpoly_pp,
         CustomData *vdata, CustomData *edata, CustomData *ldata, CustomData *pdata,
         int totvert, int totedge, int totloop, int totpoly,
@@ -266,7 +266,7 @@ int join_mesh_exec(bContext *C, wmOperator *op)
 {
 	Main *bmain = CTX_data_main(C);
 	Scene *scene = CTX_data_scene(C);
-	ObjectBase *ob_base = CTX_data_active_base(C);
+	Base *ob_base = CTX_data_active_base(C);
 	Object *ob = ob_base->object;
 	Material **matar = NULL, *ma;
 	Mesh *me;
@@ -296,7 +296,7 @@ int join_mesh_exec(bContext *C, wmOperator *op)
 	}
 	
 	/* count & check */
-	CTX_DATA_BEGIN (C, ObjectBase *, base, selected_editable_bases)
+	CTX_DATA_BEGIN (C, Base *, base, selected_editable_bases)
 	{
 		if (base->object->type == OB_MESH) {
 			me = base->object->data;
@@ -377,7 +377,7 @@ int join_mesh_exec(bContext *C, wmOperator *op)
 	}
 	
 	/* first pass over objects - copying materials and vertexgroups across */
-	CTX_DATA_BEGIN (C, ObjectBase *, base, selected_editable_bases)
+	CTX_DATA_BEGIN (C, Base *, base, selected_editable_bases)
 	{
 		/* only act if a mesh, and not the one we're joining to */
 		if ((ob != base->object) && (base->object->type == OB_MESH)) {
@@ -507,7 +507,7 @@ int join_mesh_exec(bContext *C, wmOperator *op)
 	            matar, matmap, totcol,
 	            &vertofs, &edgeofs, &loopofs, &polyofs);
 
-	CTX_DATA_BEGIN (C, ObjectBase *, base, selected_editable_bases)
+	CTX_DATA_BEGIN (C, Base *, base, selected_editable_bases)
 	{
 		if (base->object == ob) {
 			continue;
@@ -621,7 +621,7 @@ int join_mesh_shapes_exec(bContext *C, wmOperator *op)
 	KeyBlock *kb;
 	bool ok = false, nonequal_verts = false;
 	
-	CTX_DATA_BEGIN (C, ObjectBase *, base, selected_editable_bases)
+	CTX_DATA_BEGIN (C, Base *, base, selected_editable_bases)
 	{
 		if (base->object == ob) continue;
 		
@@ -654,7 +654,7 @@ int join_mesh_shapes_exec(bContext *C, wmOperator *op)
 	}
 	
 	/* now ready to add new keys from selected meshes */
-	CTX_DATA_BEGIN (C, ObjectBase *, base, selected_editable_bases)
+	CTX_DATA_BEGIN (C, Base *, base, selected_editable_bases)
 	{
 		if (base->object == ob) continue;
 		
diff --git a/source/blender/editors/object/object_add.c b/source/blender/editors/object/object_add.c
index 91cc95f79ae..e7223f6f1ee 100644
--- a/source/blender/editors/object/object_add.c
+++ b/source/blender/editors/object/object_add.c
@@ -206,7 +206,7 @@ void ED_object_rotation_from_view(bContext *C, float rot[3], const char align_ax
 	}
 }
 
-void ED_object_base_init_transform(bContext *C, ObjectBase *base, const float loc[3], const float rot[3])
+void ED_object_base_init_transform(bContext *C, Base *base, const float loc[3], const float rot[3])
 {
 	Object *ob = base->object;
 	Scene *scene = CTX_data_scene(C);
@@ -1314,7 +1314,7 @@ static bool dupliobject_cmp(const void *a_, const void *b_)
 	return false;
 }
 
-static void make_object_duplilist_real(bContext *C, Scene *scene, ObjectBase *base,
+static void make_object_duplilist_real(bContext *C, Scene *scene, Base *base,
                                        const bool use_base_parent,
                                        const bool use_hierarchy)
 {
@@ -1343,7 +1343,7 @@ static void make_object_duplilist_real(bContext *C, Scene *scene, ObjectBase *ba
 	}
 
 	for (dob = lb->first; dob; dob = dob->next) {
-		ObjectBase *basen;
+		Base *basen;
 		Object *ob = ID_NEW_SET(dob->ob, BKE_object_copy(bmain, dob->ob));
 
 		/* font duplis can have a totcol without material, we get them from parent
@@ -1495,7 +1495,7 @@ static int object_duplicates_make_real_exec(bContext *C, wmOperator *op)
 
 	BKE_main_id_clear_newpoins(bmain);
 
-	CTX_DATA_BEGIN (C, ObjectBase *, base, selected_editable_bases)
+	CTX_DATA_BEGIN (C, Base *, base, selected_editable_bases)
 	{
 		make_object_duplilist_real(C, scene, base, use_base_parent, use_hierarchy);
 
@@ -1577,10 +1577,10 @@ static int convert_poll(bContext *C)
 }
 
 /* Helper for convert_exec */
-static ObjectBase *duplibase_for_convert(Main *bmain, Scene *scene, SceneLayer *sl, ObjectBase *base, Object *ob)
+static Base *duplibase_for_convert(Main *bmain, Scene *scene, SceneLayer *sl, Base *base, Object *ob)
 {
 	Object *obn;
-	ObjectBase *basen;
+	Base *basen;
 
 	if (ob == NULL) {
 		ob = base->object;
@@ -1601,7 +1601,7 @@ static int convert_exec(bContext *C, wmOperator *op)
 	Main *bmain = CTX_data_main(C);
 	Scene *scene = CTX_data_scene(C);
 	SceneLayer *sl = CTX_data_scene_layer(C);
-	ObjectBase *basen = NULL, *basact = NULL;
+	Base *basen = NULL, *basact = NULL;
 	Object *ob, *ob1, *newob, *obact = CTX_data_active_object(C);
 	DerivedMesh *dm;
 	Curve *cu;
@@ -1639,7 +1639,7 @@ static int convert_exec(bContext *C, wmOperator *op)
 		}
 	}
 
-	CTX_DATA_BEGIN (C, ObjectBase *, base, selected_editable_bases)
+	CTX_DATA_BEGIN (C, Base *, base, selected_editable_bases)
 	{
 		ob = base->object;
 
@@ -1949,12 +1949,12 @@ void OBJECT_OT_convert(wmOperatorType *ot)
 /* used below, assumes id.new is correct */
 /* leaves selection of base/object unaltered */
 /* Does set ID->newid pointers. */
-static ObjectBase *object_add_duplicate_internal(Main *bmain, Scene *scene, SceneLayer *sl, Object *ob, int dupflag)
+static Base *object_add_duplicate_internal(Main *bmain, Scene *scene, SceneLayer *sl, Object *ob, int dupflag)
 {
 #define ID_NEW_REMAP_US(a)	if (      (a)->id.newid) { (a) = (void *)(a)->id.newid;       (a)->id.us++; }
 #define ID_NEW_REMAP_US2(a)	if (((ID *)a)->newid)    { (a) = ((ID  *)a)->newid;     ((ID *)a)->us++;    }
 
-	ObjectBase *basen = NULL;
+	Base *basen = NULL;
 	Material ***matarar;
 	Object *obn;
 	ID *id;
@@ -2186,9 +2186,9 @@ static ObjectBase *object_add_duplicate_internal(Main *bmain, Scene *scene, Scen
  * note: don't call this within a loop since clear_* funcs loop over the entire database.
  * note: caller must do DAG_relations_tag_update(bmain);
  *       this is not done automatic since we may duplicate many objects in a batch */
-ObjectBase *ED_object_add_duplicate(Main *bmain, Scene *scene, SceneLayer *sl, ObjectBase *base, int dupflag)
+Base *ED_object_add_duplicate(Main *bmain, Scene *scene, SceneLayer *sl, Base *base, int dupflag)
 {
-	ObjectBase *basen;
+	Base *basen;
 	Object *ob;
 
 	clear_sca_new_poins();  /* BGE logic */
@@ -2226,9 +2226,9 @@ static int duplicate_exec(bContext *C, wmOperator *op)
 
 	clear_sca_new_poins();  /* BGE logic */
 
-	CTX_DATA_BEGIN (C, ObjectBase *, base, selected_bases)
+	CTX_DATA_BEGIN (C, Base *, base, selected_bases)
 	{
-		ObjectBase *basen = object_add_duplicate_internal(bmain, scene, sl, base->object, dupflag);
+		Base *basen = object_add_duplicate_internal(bmain, scene, sl, base->object, dupflag);
 
 		/* note that this is safe to do with this context iterator,
 		 * the list is made in advance */
@@ -2290,7 +2290,7 @@ static int add_named_exec(bContext *C, wmOperator *op)
 	Main *bmain = CTX_data_main(C);
 	Scene *scene = CTX_data_scene(C);
 	SceneLayer *sl = CTX_data_scene_layer(C);
-	ObjectBase *basen;
+	Base *basen;
 	Object *ob;
 	const bool linked = RNA_boolean_get(op->ptr, "linked");
 	int dupflag = (linked) ? 0 : U.dupflag;
diff --git a/source/blender/editors/object/object_bake.c b/source/blender/editors/object/object_bake.c
index fcc1c003b92..11d96da5786 100644
--- a/source/blender/editors/object/object_bake.c
+++ b/source/blender/editors/object/object_bake.c
@@ -116,7 +116,7 @@ static bool multiresbake_check(bContext *C, wmOperator *op)
 	bool ok = true;
 	int a;
 
-	CTX_DATA_BEGIN (C, ObjectBase *, base, selected_editable_bases)
+	CTX_DATA_BEGIN (C, Base *, base, selected_editable_bases)
 	{
 		ob = base->object;
 
@@ -310,7 +310,7 @@ static int multiresbake_image_exec_locked(bContext *C, wmOperator *op)
 		return OPERATOR_CANCELLED;
 
 	if (scene->r.bake_flag & R_BAKE_CLEAR) {  /* clear images */
-		CTX_DATA_BEGIN (C, ObjectBase *, base, selected_editable_bases)
+		CTX_DATA_BEGIN (C, Base *, base, selected_editable_bases)
 		{
 			Mesh *me;
 			ClearFlag clear_flag = 0;
@@ -330,7 +330,7 @@ static int multiresbake_image_exec_locked(bContext *C, wmOperator *op)
 		CTX_DATA_END;
 	}
 
-	CTX_DATA_BEGIN (C, ObjectBase *, base, selected_editable_bases)
+	CTX_DATA_BEGIN (C, Base *, base, selected_editable_bases)
 	{
 		MultiresBakeRender bkr = {NULL};
 
@@ -390,7 +390,7 @@ static void init_multiresbake_job(bContext *C, MultiresBakeJob *bkj)
 	bkj->user_scale = (scene->r.bake_flag & R_BAKE_USERSCALE) ? scene->r.bake_user_scale : -1.0f;
 	//bkj->reports = op->reports;
 
-	CTX_DATA_BEGIN (C, ObjectBase *, base, selected_editable_bases)
+	CTX_DATA_BEGIN (C, Base *, base, selected_editable_bases)
 	{
 		MultiresBakerJobData *data;
 		int lvl;
diff --git a/source/blender/editors/object/object_edit.c b/source/blender/editors/object/object_edit.c
index 0e9a6c7db9c..2a4557f3610 100644
--- a/source/blender/editors/object/object_edit.c
+++ b/source/blender/editors/object/object_edit.c
@@ -460,7 +460,7 @@ void OBJECT_OT_editmode_toggle(wmOperatorType *ot)
 
 static int posemode_exec(bContext *C, wmOperator *op)
 {
-	ObjectBase *base = CTX_data_active_base(C);
+	Base *base = CTX_data_active_base(C);
 	Object *ob = base->object;
 	const int mode_flag = OB_MODE_POSE;
 	const bool is_mode_set = (ob->mode & mode_flag) != 0;
diff --git a/source/blender/editors/object/object_group.c b/source/blender/editors/object/object_group.c
index 91e2d6872f3..b22b034ecab 100644
--- a/source/blender/editors/object/object_group.c
+++ b/source/blender/editors/object/object_group.c
@@ -144,7 +144,7 @@ static int objects_add_active_exec(bContext *C, wmOperator *op)
 		if (!BKE_group_object_exists(group, ob))
 			continue;
 
-		CTX_DATA_BEGIN (C, ObjectBase *, base, selected_editable_bases)
+		CTX_DATA_BEGIN (C, Base *, base, selected_editable_bases)
 		{
 			if (BKE_group_object_exists(group, base->object))
 				continue;
@@ -218,7 +218,7 @@ static int objects_remove_active_exec(bContext *C, wmOperator *op)
 
 		if (BKE_group_object_exists(group, ob)) {
 			/* Remove groups from selected objects */
-			CTX_DATA_BEGIN (C, ObjectBase *, base, selected_editable_bases)
+			CTX_DATA_BEGIN (C, Base *, base, selected_editable_bases)
 			{
 				BKE_group_object_unlink(group, base->object);
 				ok = 1;
@@ -264,7 +264,7 @@ static int group_objects_remove_all_exec(bContext *C, wmOperator *UNUSED(op))
 {
 	Main *bmain = CTX_data_main(C);
 
-	CTX_DATA_BEGIN (C, ObjectBase *, base, selected_editable_bases)
+	CTX_DATA_BEGIN (C, Base *, base, selected_editable_bases)
 	{
 		BKE_object_groups_clear(base->object);
 	}
@@ -310,7 +310,7 @@ static int group_objects_remove_exec(bContext *C, wmOperator *op)
 			continue;
 
 		/* now remove all selected objects from the group */
-		CTX_DATA_BEGIN (C, ObjectBase *, base, selected_editable_bases)
+		CTX_DATA_BEGIN (C, Base *, base, selected_editable_bases)
 		{
 			BKE_group_object_unlink(group, base->object);
 			updated = true;
@@ -361,7 +361,7 @@ static int group_create_exec(bContext *C, wmOperator *op)
 	
 	group = BKE_group_add(bmain, name);
 		
-	CTX_DATA_BEGIN (C, ObjectBase *, base, selected_bases)
+	CTX_DATA_BEGIN (C, Base *, base, selected_bases)
 	{
 		BKE_group_object_add(group, base->object);
 	}
@@ -551,7 +551,7 @@ static int select_grouped_exec(bContext *C, wmOperator *UNUSED(op))  /* Select o
 	if (!group)
 		return OPERATOR_CANCELLED;
 
-	CTX_DATA_BEGIN (C, ObjectBase *, base, visible_bases)
+	CTX_DATA_BEGIN (C, Base *, base, visible_bases)
 	{
 		if (((base->flag & BASE_SELECTED) == 0) && ((base->flag & BASE_SELECTABLED) != 0)) {
 			if (BKE_group_object_exists(group, base->object)) {
diff --git a/source/blender/editors/object/object_relations.c b/source/blender/editors/object/object_relations.c
index a78802e3069..c79c702837a 100644
--- a/source/blender/editors/object/object_relations.c
+++ b/source/blender/editors/object/object_relations.c
@@ -1350,7 +1350,7 @@ static int make_links_scene_exec(bContext *C, wmOperator *op)
 	}
 
 	SceneCollection *sc_to = BKE_collection_master(scene_to);
-	CTX_DATA_BEGIN (C, ObjectBase *, base, selected_bases)
+	CTX_DATA_BEGIN (C, Base *, base, selected_bases)
 	{
 		BKE_collection_object_add(scene_to, sc_to, base->object);
 	}
@@ -1425,7 +1425,7 @@ static int make_links_data_exec(bContext *C, wmOperator *op)
 		ob_groups = BKE_object_groups(ob_src);
 	}
 
-	CTX_DATA_BEGIN (C, ObjectBase *, base_dst, selected_editable_bases)
+	CTX_DATA_BEGIN (C, Base *, base_dst, selected_editable_bases)
 	{
 		Object *ob_dst = base_dst->object;
 
@@ -1682,7 +1682,7 @@ static void single_object_users(Main *bmain, Scene *scene, View3D *v3d, const in
 
 	/* loop over SceneLayers and assign the pointers accordingly */
 	for (SceneLayer *sl = scene->render_layers.first; sl; sl = sl->next) {
-		for (ObjectBase *base = sl->object_bases.first; base; base = base->next) {
+		for (Base *base = sl->object_bases.first; base; base = base->next) {
 			ID_NEW_REMAP(base->object);
 		}
 	}
diff --git a/source/blender/editors/object/object_select.c b/source/blender/editors/object/object_select.c
index 39166da7597..961278c2c83 100644
--- a/source/blender/editors/object/object_select.c
+++ b/source/blender/editors/object/object_select.c
@@ -120,7 +120,7 @@ void ED_base_object_activate(bContext *C, BaseLegacy *base)
 		WM_event_add_notifier(C, NC_SCENE | ND_OB_ACTIVE, NULL);
 }
 
-void ED_object_base_select(ObjectBase *base, short mode)
+void ED_object_base_select(Base *base, short mode)
 {
 	if (base) {
 		if (mode == BA_SELECT) {
@@ -134,7 +134,7 @@ void ED_object_base_select(ObjectBase *base, short mode)
 	}
 }
 
-void ED_object_base_activate(bContext *C, ObjectBase *base)
+void ED_object_base_activate(bContext *C, Base *base)
 {
 	SceneLayer *sl = CTX_data_scene_layer(C);
 	sl->basact = base;
@@ -173,14 +173,14 @@ static int object_select_by_type_exec(bContext *C, wmOperator *op)
 	extend = RNA_boolean_get(op->ptr, "extend");
 		
 	if (extend == 0) {
-		CTX_DATA_BEGIN (C, ObjectBase *, base, visible_bases)
+		CTX_DATA_BEGIN (C, Base *, base, visible_bases)
 		{
 			ED_object_base_select(base, BA_DESELECT);
 		}
 		CTX_DATA_END;
 	}
 	
-	CTX_DATA_BEGIN (C, ObjectBase *, base, visible_bases)
+	CTX_DATA_BEGIN (C, Base *, base, visible_bases)
 	{
 		if (base->object->type == obtype) {
 			ED_object_base_select(base, BA_SELECT);
@@ -242,7 +242,7 @@ static bool object_select_all_by_obdata(bContext *C, void *obdata)
 {
 	bool changed = false;
 
-	CTX_DATA_BEGIN (C, ObjectBase *, base, visible_bases)
+	CTX_DATA_BEGIN (C, Base *, base, visible_bases)
 	{
 		if (((base->flag & BASE_SELECTED) == 0) && ((base->flag & BASE_SELECTABLED) != 0)) {
 			if (base->object->data == obdata) {
@@ -260,7 +260,7 @@ static bool object_select_all_by_material_texture(bContext *C, int use_texture,
 {
 	bool changed = false;
 
-	CTX_DATA_BEGIN (C, ObjectBase *, base, visible_bases)
+	CTX_DATA_BEGIN (C, Base *, base, visible_bases)
 	{
 		if (((base->flag & BASE_SELECTED) == 0) && ((base->flag & BASE_SELECTABLED) != 0)) {
 			Object *ob = base->object;
@@ -300,7 +300,7 @@ static bool object_select_all_by_dup_group(bContext *C, Object *ob)
 	bool changed = false;
 	Group *dup_group = (ob->transflag & OB_DUPLIGROUP) ? ob->dup_group : NULL;
 
-	CTX_DATA_BEGIN (C, ObjectBase *, base, visible_bases)
+	CTX_DATA_BEGIN (C, Base *, base, visible_bases)
 	{
 		if (((base->flag & BASE_SELECTED) == 0) && ((base->flag & BASE_SELECTABLED) != 0)) {
 			Group *dup_group_other = (base->object->transflag & OB_DUPLIGROUP) ? base->object->dup_group : NULL;
@@ -320,7 +320,7 @@ static bool object_select_all_by_particle(bContext *C, Object *ob)
 	ParticleSystem *psys_act = psys_get_current(ob);
 	bool changed = false;
 
-	CTX_DATA_BEGIN (C, ObjectBase *, base, visible_bases)
+	CTX_DATA_BEGIN (C, Base *, base, visible_bases)
 	{
 		if (((base->flag & BASE_SELECTED) == 0) && ((base->flag & BASE_SELECTABLED) != 0)) {
 			/* loop through other particles*/
@@ -348,7 +348,7 @@ static bool object_select_all_by_library(bContext *C, Library *lib)
 {
 	bool changed = false;
 
-	CTX_DATA_BEGIN (C, ObjectBase *, base, visible_bases)
+	CTX_DATA_BEGIN (C, Base *, base, visible_bases)
 	{
 		if (((base->flag & BASE_SELECTED) == 0) && ((base->flag & BASE_SELECTABLED) != 0)) {
 			if (lib == base->object->id.lib) {
@@ -366,7 +366,7 @@ static bool object_select_all_by_library_obdata(bContext *C, Library *lib)
 {
 	bool changed = false;
 
-	CTX_DATA_BEGIN (C, ObjectBase *, base, visible_bases)
+	CTX_DATA_BEGIN (C, Base *, base, visible_bases)
 	{
 		if (((base->flag & BASE_SELECTED) == 0) && ((base->flag & BASE_SELECTABLED) != 0)) {
 			if (base->object->data && lib == ((ID *)base->object->data)->lib) {
@@ -410,7 +410,7 @@ static int object_select_linked_exec(bContext *C, wmOperator *op)
 	extend = RNA_boolean_get(op->ptr, "extend");
 	
 	if (extend == 0) {
-		CTX_DATA_BEGIN (C, ObjectBase *, base, visible_bases)
+		CTX_DATA_BEGIN (C, Base *, base, visible_bases)
 		{
 			ED_object_base_select(base, BA_DESELECT);
 		}
@@ -542,7 +542,7 @@ static bool select_grouped_children(bContext *C, Object *ob, const bool recursiv
 {
 	bool changed = false;
 
-	CTX_DATA_BEGIN (C, ObjectBase *, base, selectable_bases)
+	CTX_DATA_BEGIN (C, Base *, base, selectable_bases)
 	{
 		if (ob == base->object->parent) {
 			if ((base->flag & BASE_SELECTED) == 0) {
@@ -563,7 +563,7 @@ static bool select_grouped_parent(bContext *C) /* Makes parent active and de-sel
 {
 	SceneLayer *sl = CTX_data_scene_layer(C);
 	View3D *v3d = CTX_wm_view3d(C);
-	ObjectBase *baspar, *basact = CTX_data_active_base(C);
+	Base *baspar, *basact = CTX_data_active_base(C);
 	bool changed = false;
 
 	if (!basact || !(basact->object->parent)) {
@@ -602,7 +602,7 @@ static bool select_grouped_group(bContext *C, Object *ob)  /* Select objects in
 		return 0;
 	else if (group_count == 1) {
 		group = ob_groups[0];
-		CTX_DATA_BEGIN (C, ObjectBase *, base, visible_bases)
+		CTX_DATA_BEGIN (C, Base *, base, visible_bases)
 		{
 			if (((base->flag & BASE_SELECTED) == 0) && ((base->flag & BASE_SELECTABLED) != 0)) {
 				if (BKE_group_object_exists(group, base->object)) {
@@ -659,7 +659,7 @@ static bool select_grouped_siblings(bContext *C, Object *ob)
 {
 	bool changed = false;
 
-	CTX_DATA_BEGIN (C, ObjectBase *, base, selectable_bases)
+	CTX_DATA_BEGIN (C, Base *, base, selectable_bases)
 	{
 		if ((base->object->parent == ob->parent) && ((base->flag & BASE_SELECTED) == 0)) {
 			ED_object_base_select(base, BA_SELECT);
@@ -675,7 +675,7 @@ static bool select_grouped_lamptype(bContext *C, Object *ob)
 
 	bool changed = false;
 
-	CTX_DATA_BEGIN (C, ObjectBase *, base, selectable_bases)
+	CTX_DATA_BEGIN (C, Base *, base, selectable_bases)
 	{
 		if (base->object->type == OB_LAMP) {
 			Lamp *la_test = base->object->data;
@@ -692,7 +692,7 @@ static bool select_grouped_type(bContext *C, Object *ob)
 {
 	bool changed = false;
 
-	CTX_DATA_BEGIN (C, ObjectBase *, base, selectable_bases)
+	CTX_DATA_BEGIN (C, Base *, base, selectable_bases)
 	{
 		if ((base->object->type == ob->type) && ((base->flag & BASE_SELECTED) == 0)) {
 			ED_object_base_select(base, BA_SELECT);
@@ -707,7 +707,7 @@ static bool select_grouped_index_object(bContext *C, Object *ob)
 {
 	bool changed = false;
 
-	CTX_DATA_BEGIN (C, ObjectBase *, base, selectable_bases)
+	CTX_DATA_BEGIN (C, Base *, base, selectable_bases)
 	{
 		if ((base->object->index == ob->index) && ((base->flag & BASE_SELECTED) == 0)) {
 			ED_object_base_select(base, BA_SELECT);
@@ -722,7 +722,7 @@ static bool select_grouped_color(bContext *C, Object *ob)
 {
 	bool changed = false;
 
-	CTX_DATA_BEGIN (C, ObjectBase *, base, selectable_bases)
+	CTX_DATA_BEGIN (C, Base *, base, selectable_bases)
 	{
 		if (((base->flag & BASE_SELECTED) == 0) && (compare_v3v3(base->object->col, ob->col, 0.005f))) {
 			ED_object_base_select(base, BA_SELECT);
@@ -749,7 +749,7 @@ static bool select_grouped_gameprops(bContext *C, Object *ob)
 {
 	bool changed = false;
 
-	CTX_DATA_BEGIN (C, ObjectBase *, base, selectable_bases)
+	CTX_DATA_BEGIN (C, Base *, base, selectable_bases)
 	{
 		if (((base->flag & BASE_SELECTED) == 0) && (objects_share_gameprop(base->object, ob))) {
 			ED_object_base_select(base, BA_SELECT);
@@ -787,7 +787,7 @@ static bool select_grouped_keyingset(bContext *C, Object *UNUSED(ob), ReportList
 	/* select each object that Keying Set refers to */
 	/* TODO: perhaps to be more in line with the rest of these, we should only take objects
 	 * if the passed in object is included in this too */
-	CTX_DATA_BEGIN (C, ObjectBase *, base, selectable_bases)
+	CTX_DATA_BEGIN (C, Base *, base, selectable_bases)
 	{
 		/* only check for this object if it isn't selected already, to limit time wasted */
 		if ((base->flag & BASE_SELECTED) == 0) {
@@ -821,7 +821,7 @@ static int object_select_grouped_exec(bContext *C, wmOperator *op)
 	extend = RNA_boolean_get(op->ptr, "extend");
 
 	if (extend == 0) {
-		CTX_DATA_BEGIN (C, ObjectBase *, base, visible_bases)
+		CTX_DATA_BEGIN (C, Base *, base, visible_bases)
 		{
 			ED_object_base_select(base, BA_DESELECT);
 			changed = true;
@@ -919,7 +919,7 @@ static int object_select_all_exec(bContext *C, wmOperator *op)
 
 	if (action == SEL_TOGGLE) {
 		action = SEL_SELECT;
-		CTX_DATA_BEGIN (C, ObjectBase *, base, visible_bases)
+		CTX_DATA_BEGIN (C, Base *, base, visible_bases)
 		{
 			if ((base->flag & BASE_SELECTED) != 0) {
 				action = SEL_DESELECT;
@@ -929,7 +929,7 @@ static int object_select_all_exec(bContext *C, wmOperator *op)
 		CTX_DATA_END;
 	}
 
-	CTX_DATA_BEGIN (C, ObjectBase *, base, visible_bases)
+	CTX_DATA_BEGIN (C, Base *, base, visible_bases)
 	{
 		switch (action) {
 			case SEL_SELECT:
@@ -991,7 +991,7 @@ static int object_select_same_group_exec(bContext *C, wmOperator *op)
 		return OPERATOR_PASS_THROUGH;
 	}
 
-	CTX_DATA_BEGIN (C, ObjectBase *, base, visible_bases)
+	CTX_DATA_BEGIN (C, Base *, base, visible_bases)
 	{
 		if (((base->flag & BASE_SELECTED) == 0) && ((base->flag & BASE_SELECTABLED) != 0)) {
 			if (BKE_group_object_exists(group, base->object)) {
@@ -1033,7 +1033,7 @@ static int object_select_mirror_exec(bContext *C, wmOperator *op)
 	
 	extend = RNA_boolean_get(op->ptr, "extend");
 	
-	CTX_DATA_BEGIN (C, ObjectBase *, primbase, selected_bases)
+	CTX_DATA_BEGIN (C, Base *, primbase, selected_bases)
 	{
 		char name_flip[MAXBONENAME];
 
@@ -1042,7 +1042,7 @@ static int object_select_mirror_exec(bContext *C, wmOperator *op)
 		if (!STREQ(name_flip, primbase->object->id.name + 2)) {
 			Object *ob = (Object *)BKE_libblock_find_name(ID_OB, name_flip);
 			if (ob) {
-				ObjectBase *secbase = BKE_scene_layer_base_find(sl, ob);
+				Base *secbase = BKE_scene_layer_base_find(sl, ob);
 
 				if (secbase) {
 					ED_object_base_select(secbase, BA_SELECT);
@@ -1111,7 +1111,7 @@ static bool object_select_more_less(bContext *C, const bool select)
 
 
 	for (ctx_base = ctx_base_list.first; ctx_base; ctx_base = ctx_base->next) {
-		Object *ob = ((ObjectBase *)ctx_base->ptr.data)->object;
+		Object *ob = ((Base *)ctx_base->ptr.data)->object;
 		if (ob->parent) {
 			if ((ob->flag & OB_DONE) != (ob->parent->flag & OB_DONE)) {
 				ob->id.tag         |= LIB_TAG_DOIT;
@@ -1125,7 +1125,7 @@ static bool object_select_more_less(bContext *C, const bool select)
 	const short select_flag = select ? SELECT : 0;
 
 	for (ctx_base = ctx_base_list.first; ctx_base; ctx_base = ctx_base->next) {
-		ObjectBase *base = ctx_base->ptr.data;
+		Base *base = ctx_base->ptr.data;
 		Object *ob = base->object;
 		if ((ob->id.tag & LIB_TAG_DOIT) && ((ob->flag & SELECT) != select_flag)) {
 			ED_object_base_select(base, select_mode);
@@ -1207,7 +1207,7 @@ static int object_select_random_exec(bContext *C, wmOperator *op)
 
 	RNG *rng = BLI_rng_new_srandom(seed);
 
-	CTX_DATA_BEGIN (C, ObjectBase *, base, selectable_bases)
+	CTX_DATA_BEGIN (C, Base *, base, selectable_bases)
 	{
 		if (BLI_rng_get_float(rng) < randfac) {
 			ED_object_base_select(base, select);
diff --git a/source/blender/editors/screen/screen_context.c b/source/blender/editors/screen/screen_context.c
index c844f56cfc2..c82a210725c 100644
--- a/source/blender/editors/screen/screen_context.c
+++ b/source/blender/editors/screen/screen_context.c
@@ -107,7 +107,7 @@ int ed_screen_context(const bContext *C, const char *member, bContextDataResult
 		return 1;
 	}
 	else if (CTX_data_equals(member, "selectable_objects")) {
-		for (ObjectBase *base = sl->object_bases.first; base; base = base->next) {
+		for (Base *base = sl->object_bases.first; base; base = base->next) {
 			if (((base->flag & BASE_VISIBLED) != 0) && ((base->flag & BASE_SELECTABLED) != 0)) {
 				CTX_data_id_list_add(result, &base->object->id);
 			}
@@ -151,7 +151,7 @@ int ed_screen_context(const bContext *C, const char *member, bContextDataResult
 		return 1;
 	}
 	else if ( CTX_data_equals(member, "visible_bases")) {
-		ObjectBase *base;
+		Base *base;
 		FOREACH_VISIBLE_BASE(sl, base)
 		{
 			CTX_data_list_add(result, &scene->id, &RNA_ObjectBase, base);
@@ -161,7 +161,7 @@ int ed_screen_context(const bContext *C, const char *member, bContextDataResult
 		return 1;
 	}
 	else if (CTX_data_equals(member, "selectable_bases")) {
-		for (ObjectBase *base = sl->object_bases.first; base; base = base->next) {
+		for (Base *base = sl->object_bases.first; base; base = base->next) {
 			if ((base->flag & BASE_SELECTABLED) != 0) {
 				CTX_data_list_add(result, &scene->id, &RNA_ObjectBase, base);
 			}
@@ -170,7 +170,7 @@ int ed_screen_context(const bContext *C, const char *member, bContextDataResult
 		return 1;
 	}
 	else if (CTX_data_equals(member, "selected_bases")) {
-		for (ObjectBase *base = sl->object_bases.first; base; base = base->next) {
+		for (Base *base = sl->object_bases.first; base; base = base->next) {
 			if ((base->flag & BASE_SELECTED) != 0) {
 				CTX_data_list_add(result, &scene->id, &RNA_ObjectBase, base);
 			}
@@ -179,7 +179,7 @@ int ed_screen_context(const bContext *C, const char *member, bContextDataResult
 		return 1;
 	}
 	else if (CTX_data_equals(member, "selected_editable_bases")) {
-		for (ObjectBase *base = sl->object_bases.first; base; base = base->next) {
+		for (Base *base = sl->object_bases.first; base; base = base->next) {
 			if ((base->flag & BASE_SELECTED) != 0) {
 				if (0 == BKE_object_is_libdata(base->object)) {
 					CTX_data_list_add(result, &scene->id, &RNA_ObjectBase, base);
@@ -191,7 +191,7 @@ int ed_screen_context(const bContext *C, const char *member, bContextDataResult
 	}
 	else if (CTX_data_equals(member, "editable_bases")) {
 		/* Visible + Editable, but not necessarily selected */
-		for (ObjectBase *base = sl->object_bases.first; base; base = base->next) {
+		for (Base *base = sl->object_bases.first; base; base = base->next) {
 			if ((base->flag & BASE_VISIBLED) != 0) {
 				if (0 == BKE_object_is_libdata(base->object)) {
 					CTX_data_list_add(result, &scene->id, &RNA_ObjectBase, base);
diff --git a/source/blender/editors/space_outliner/outliner_edit.c b/source/blender/editors/space_outliner/outliner_edit.c
index 365797501a4..c35f2006f09 100644
--- a/source/blender/editors/space_outliner/outliner_edit.c
+++ b/source/blender/editors/space_outliner/outliner_edit.c
@@ -2197,7 +2197,7 @@ static int scene_drop_invoke(bContext *C, wmOperator *op, const wmEvent *event)
 		BKE_collection_object_add(scene, sc, ob);
 
 		for (SceneLayer *sl = scene->render_layers.first; sl; sl = sl->next) {
-			ObjectBase *base = BKE_scene_layer_base_find(sl, ob);
+			Base *base = BKE_scene_layer_base_find(sl, ob);
 			if (base) {
 				ED_object_base_select(base, BA_SELECT);
 			}
diff --git a/source/blender/editors/space_outliner/outliner_select.c b/source/blender/editors/space_outliner/outliner_select.c
index f6d8478f35a..3018ef1e571 100644
--- a/source/blender/editors/space_outliner/outliner_select.c
+++ b/source/blender/editors/space_outliner/outliner_select.c
@@ -659,7 +659,7 @@ static eOLDrawState tree_element_active_pose(
 	TODO_LAYER_CONTEXT; /* we may need to pass SceneLayer instead of Scene here */
 	SceneLayer *sl = CTX_data_scene_layer(C);
 	Object *ob = (Object *)tselem->id;
-	ObjectBase *base = BKE_scene_layer_base_find(sl, ob);
+	Base *base = BKE_scene_layer_base_find(sl, ob);
 	
 	if (set != OL_SETSEL_NONE) {
 		if (scene->obedit)
diff --git a/source/blender/editors/space_outliner/outliner_tools.c b/source/blender/editors/space_outliner/outliner_tools.c
index 921914922e1..550dc63dd3c 100644
--- a/source/blender/editors/space_outliner/outliner_tools.c
+++ b/source/blender/editors/space_outliner/outliner_tools.c
@@ -366,7 +366,7 @@ static void object_select_cb(
 {
 	SceneLayer *sl = CTX_data_scene_layer(C);
 	Object *ob = (Object *)tselem->id;
-	ObjectBase *base = BKE_scene_layer_base_find(sl, ob);
+	Base *base = BKE_scene_layer_base_find(sl, ob);
 
 	if (base && ((base->flag & BASE_VISIBLED) != 0)) {
 		base->flag |= BASE_SELECTED;
@@ -391,7 +391,7 @@ static void object_deselect_cb(
 {
 	SceneLayer *sl = CTX_data_scene_layer(C);
 	Object *ob = (Object *)tselem->id;
-	ObjectBase *base = BKE_scene_layer_base_find(sl, ob);
+	Base *base = BKE_scene_layer_base_find(sl, ob);
 
 	if (base) {
 		base->flag &= ~BASE_SELECTED;
diff --git a/source/blender/editors/space_view3d/view3d_select.c b/source/blender/editors/space_view3d/view3d_select.c
index a6c6801e84d..e7c8cd340c8 100644
--- a/source/blender/editors/space_view3d/view3d_select.c
+++ b/source/blender/editors/space_view3d/view3d_select.c
@@ -1016,7 +1016,7 @@ static int object_select_menu_exec(bContext *C, wmOperator *op)
 	const char *name = object_mouse_select_menu_data[name_index].idname;
 
 	if (!toggle) {
-		CTX_DATA_BEGIN (C, ObjectBase *, base, selectable_bases)
+		CTX_DATA_BEGIN (C, Base *, base, selectable_bases)
 		{
 			if ((base->flag & BASE_SELECTED) != 0) {
 				ED_object_base_select(base, BA_DESELECT);
@@ -1026,7 +1026,7 @@ static int object_select_menu_exec(bContext *C, wmOperator *op)
 		CTX_DATA_END;
 	}
 
-	CTX_DATA_BEGIN (C, ObjectBase *, base, selectable_bases)
+	CTX_DATA_BEGIN (C, Base *, base, selectable_bases)
 	{
 		/* this is a bit dodjy, there should only be ONE object with this name, but library objects can mess this up */
 		if (STREQ(name, base->object->id.name + 2)) {
diff --git a/source/blender/editors/transform/transform_conversions.c b/source/blender/editors/transform/transform_conversions.c
index 147dd68efd4..cb828914735 100644
--- a/source/blender/editors/transform/transform_conversions.c
+++ b/source/blender/editors/transform/transform_conversions.c
@@ -1796,7 +1796,7 @@ static void createTransParticleVerts(bContext *C, TransInfo *t)
 {
 	TransData *td = NULL;
 	TransDataExtension *tx;
-	ObjectBase *base = CTX_data_active_base(C);
+	Base *base = CTX_data_active_base(C);
 	Object *ob = CTX_data_active_object(C);
 	ParticleEditSettings *pset = PE_settings(t->scene);
 	PTCacheEdit *edit = PE_get_current(t->scene, ob);
@@ -6398,7 +6398,7 @@ static void createTransObject(bContext *C, TransInfo *t)
 	td = t->data = MEM_callocN(t->total * sizeof(TransData), "TransOb");
 	tx = t->ext = MEM_callocN(t->total * sizeof(TransDataExtension), "TransObExtension");
 
-	CTX_DATA_BEGIN(C, ObjectBase *, base, selected_bases)
+	CTX_DATA_BEGIN(C, Base *, base, selected_bases)
 	{
 		Object *ob = base->object;
 		
diff --git a/source/blender/editors/transform/transform_orientations.c b/source/blender/editors/transform/transform_orientations.c
index dfcfc5c2c98..62360c8972a 100644
--- a/source/blender/editors/transform/transform_orientations.c
+++ b/source/blender/editors/transform/transform_orientations.c
@@ -119,7 +119,7 @@ static TransformOrientation *createViewSpace(bContext *C, ReportList *UNUSED(rep
 static TransformOrientation *createObjectSpace(bContext *C, ReportList *UNUSED(reports),
                                                const char *name, const bool overwrite)
 {
-	ObjectBase *base = CTX_data_active_base(C);
+	Base *base = CTX_data_active_base(C);
 	Object *ob;
 	float mat[3][3];
 
diff --git a/source/blender/makesdna/DNA_layer_types.h b/source/blender/makesdna/DNA_layer_types.h
index 6071d60fe87..3a4293c8ad8 100644
--- a/source/blender/makesdna/DNA_layer_types.h
+++ b/source/blender/makesdna/DNA_layer_types.h
@@ -33,8 +33,8 @@ extern "C" {
 
 #include "DNA_listBase.h"
 
-typedef struct ObjectBase {
-	struct ObjectBase *next, *prev;
+typedef struct Base {
+	struct Base *next, *prev;
 	short flag;
 	short refcount;
 	short sx, sy;
@@ -43,7 +43,7 @@ typedef struct ObjectBase {
 	unsigned int lay;
 	int flag_legacy;
 	int pad;
-} ObjectBase;
+} Base;
 
 typedef struct CollectionOverride {
 	struct CollectionOverride *next, *prev;
@@ -70,7 +70,7 @@ typedef struct SceneLayer {
 	short flag;
 	short pad[2];
 	ListBase object_bases;      /* ObjectBase */
-	struct ObjectBase *basact;
+	struct Base *basact;
 	ListBase layer_collections; /* LayerCollection */
 } SceneLayer;
 
@@ -85,7 +85,7 @@ typedef struct SceneCollection {
 	ListBase scene_collections; /* nested collections */
 } SceneCollection;
 
-/* ObjectBase->flag */
+/* Base->flag */
 enum {
 	BASE_SELECTED         = (1 << 0),
 	BASE_VISIBLED         = (1 << 1),
diff --git a/source/blender/makesdna/DNA_scene_types.h b/source/blender/makesdna/DNA_scene_types.h
index 2a61ac2d946..6e56824b176 100644
--- a/source/blender/makesdna/DNA_scene_types.h
+++ b/source/blender/makesdna/DNA_scene_types.h
@@ -74,13 +74,6 @@ struct SceneCollection;
 
 /* Base - Wrapper for referencing Objects in a Scene */
 #define BaseLegacy Base
-typedef struct Base {
-	struct Base *next, *prev;
-	unsigned int lay, selcol;
-	int flag_legacy;
-	short sx, sy;
-	struct Object *object;
-} Base;
 
 /* ************************************************************* */
 /* Output Format Data */
diff --git a/source/blender/makesrna/intern/rna_object.c b/source/blender/makesrna/intern/rna_object.c
index bf07036d059..f8b3bdd62e9 100644
--- a/source/blender/makesrna/intern/rna_object.c
+++ b/source/blender/makesrna/intern/rna_object.c
@@ -2908,12 +2908,12 @@ static void rna_def_object_base_legacy(BlenderRNA *brna)
 	RNA_def_property_array(prop, 8);
 	RNA_def_property_clear_flag(prop, PROP_EDITABLE);
 	RNA_def_property_ui_text(prop, "Local View Layers", "3D local view layers the object base is on");
-	
+
 	prop = RNA_def_property(srna, "select", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "flag_legacy", BA_SELECT);
 	RNA_def_property_ui_text(prop, "Select", "Object base selection state");
 	RNA_def_property_update(prop, NC_OBJECT | ND_DRAW, "rna_Base_select_update");
-	
+
 	RNA_api_object_base_legacy(srna);
 }
 
diff --git a/source/blender/makesrna/intern/rna_object_api.c b/source/blender/makesrna/intern/rna_object_api.c
index aa51cc7d7cd..c93f72e798f 100644
--- a/source/blender/makesrna/intern/rna_object_api.c
+++ b/source/blender/makesrna/intern/rna_object_api.c
@@ -95,7 +95,7 @@ static EnumPropertyItem space_items[] = {
 static void rna_Object_select_set(Object *ob, bContext *C, ReportList *reports, int action)
 {
 	SceneLayer *sl = CTX_data_scene_layer(C);
-	ObjectBase *base = BKE_scene_layer_base_find(sl, ob);
+	Base *base = BKE_scene_layer_base_find(sl, ob);
 
 	if (!base) {
 		BKE_reportf(reports, RPT_ERROR, "Object '%s' not in Render Layer '%s'!", ob->id.name + 2, sl->name);
@@ -125,7 +125,7 @@ static void rna_Object_select_set(Object *ob, bContext *C, ReportList *reports,
 static int rna_Object_select_get(Object *ob, bContext *C, ReportList *reports)
 {
 	SceneLayer *sl = CTX_data_scene_layer(C);
-	ObjectBase *base = BKE_scene_layer_base_find(sl, ob);
+	Base *base = BKE_scene_layer_base_find(sl, ob);
 
 	if (!base) {
 		BKE_reportf(reports, RPT_ERROR, "Object '%s' not in Render Layer '%s'!", ob->id.name + 2, sl->name);
diff --git a/source/blender/makesrna/intern/rna_scene.c b/source/blender/makesrna/intern/rna_scene.c
index 0320808a6ff..ec9a08af287 100644
--- a/source/blender/makesrna/intern/rna_scene.c
+++ b/source/blender/makesrna/intern/rna_scene.c
@@ -2454,7 +2454,7 @@ static void rna_LayerCollection_name_set(PointerRNA *ptr, const char *value)
 static PointerRNA rna_LayerCollection_objects_get(CollectionPropertyIterator *iter)
 {
 	ListBaseIterator *internal = &iter->internal.listbase;
-	ObjectBase *base = ((LinkData *)internal->link)->data;
+	Base *base = ((LinkData *)internal->link)->data;
 	return rna_pointer_inherit_refine(&iter->parent, &RNA_Object, base->object);
 }
 
@@ -2614,14 +2614,14 @@ static PointerRNA rna_SceneLayer_objects_get(CollectionPropertyIterator *iter)
 	ListBaseIterator *internal = &iter->internal.listbase;
 
 	/* we are actually iterating a ObjectBase list, so override get */
-	ObjectBase *base = (ObjectBase *)internal->link;
+	Base *base = (Base *)internal->link;
 	return rna_pointer_inherit_refine(&iter->parent, &RNA_Object, base->object);
 }
 
 static int rna_SceneLayer_objects_selected_skip(CollectionPropertyIterator *iter, void *UNUSED(data))
 {
 	ListBaseIterator *internal = &iter->internal.listbase;
-	ObjectBase *base = (ObjectBase *)internal->link;
+	Base *base = (Base *)internal->link;
 
 	if ((base->flag & BASE_SELECTED) != 0) {
 			return 0;
@@ -2758,7 +2758,7 @@ static void rna_SceneLayer_remove(
 
 static void rna_ObjectBase_select_update(Main *UNUSED(bmain), Scene *UNUSED(scene), PointerRNA *ptr)
 {
-	ObjectBase *base = (ObjectBase *)ptr->data;
+	Base *base = (Base *)ptr->data;
 	short mode = (base->flag & BASE_SELECTED) ? BA_SELECT : BA_DESELECT;
 	ED_object_base_select(base, mode);
 }
@@ -6148,7 +6148,7 @@ static void rna_def_object_base(BlenderRNA *brna)
 	PropertyRNA *prop;
 
 	srna = RNA_def_struct(brna, "ObjectBase", NULL);
-	RNA_def_struct_sdna(srna, "ObjectBase");
+	RNA_def_struct_sdna(srna, "Base");
 	RNA_def_struct_ui_text(srna, "Object Base", "An object instance in a render layer");
 	RNA_def_struct_ui_icon(srna, ICON_OBJECT_DATA);
 
diff --git a/source/blenderplayer/bad_level_call_stubs/stubs.c b/source/blenderplayer/bad_level_call_stubs/stubs.c
index 3a836b3462d..a9cf76adae3 100644
--- a/source/blenderplayer/bad_level_call_stubs/stubs.c
+++ b/source/blenderplayer/bad_level_call_stubs/stubs.c
@@ -44,6 +44,7 @@
 struct ARegion;
 struct ARegionType;
 struct BMEditMesh;
+struct Base;
 struct BaseLegacy;
 struct bContext;
 struct BoundBox;
@@ -83,7 +84,6 @@ struct HookModifierData;
 struct NodeBlurData;
 struct Nurb;
 struct Object;
-struct ObjectBase;
 struct PBVHNode;
 struct PyObject;
 struct Render;
@@ -488,7 +488,7 @@ void ED_node_shader_default(const struct bContext *C, struct ID *id) RET_NONE
 void ED_screen_animation_timer_update(struct bScreen *screen, int redraws, int refresh) RET_NONE
 struct bScreen *ED_screen_animation_playing(const struct wmWindowManager *wm) RET_NULL
 void ED_base_object_select(struct BaseLegacy *base, short mode) RET_NONE
-void ED_object_base_select(struct ObjectBase *base, short mode) RET_NONE
+void ED_object_base_select(struct Base *base, short mode) RET_NONE
 bool ED_object_modifier_remove(struct ReportList *reports, struct Main *bmain, struct Object *ob, struct ModifierData *md) RET_ZERO
 struct ModifierData *ED_object_modifier_add(struct ReportList *reports, struct Main *bmain, struct Scene *scene, struct Object *ob, const char *name, int type) RET_ZERO
 void ED_object_modifier_clear(struct Main *bmain, struct Object *ob) RET_NONE