Farewell BaseLegacy

Finally, bases are all using the latest, newest SceneLayer bases.

6 files changed, 4 insertions, 7 deletions

diff --git a/source/blender/blenkernel/BKE_group.h b/source/blender/blenkernel/BKE_group.h
index 205f42d6643..9aab6950496 100644
--- a/source/blender/blenkernel/BKE_group.h
+++ b/source/blender/blenkernel/BKE_group.h
@@ -33,7 +33,6 @@
  *  \author nzc
  */
 
-struct BaseLegacy;
 struct Base;
 struct EvaluationContext;
 struct Group;
diff --git a/source/blender/blenkernel/BKE_object.h b/source/blender/blenkernel/BKE_object.h
index 380da4530b9..14409c77e6d 100644
--- a/source/blender/blenkernel/BKE_object.h
+++ b/source/blender/blenkernel/BKE_object.h
@@ -35,7 +35,6 @@ extern "C" {
 
 #include "BLI_compiler_attrs.h"
 
-struct BaseLegacy;
 struct EvaluationContext;
 struct Scene;
 struct SceneLayer;
diff --git a/source/blender/blenkernel/BKE_scene.h b/source/blender/blenkernel/BKE_scene.h
index b9a9b6452d9..0062a0a1932 100644
--- a/source/blender/blenkernel/BKE_scene.h
+++ b/source/blender/blenkernel/BKE_scene.h
@@ -38,7 +38,6 @@ extern "C" {
 #endif
 
 struct AviCodecData;
-struct BaseLegacy;
 struct Depsgraph;
 struct EvaluationContext;
 struct Main;
@@ -104,7 +103,7 @@ typedef struct SceneBaseIter {
 
 int BKE_scene_base_iter_next(
         const struct EvaluationContext *eval_ctx, struct SceneBaseIter *iter,
-        struct Scene **scene, int val, struct BaseLegacy **base, struct Object **ob);
+        struct Scene **scene, int val, struct Base **base, struct Object **ob);
 
 void BKE_scene_base_flag_to_objects(struct SceneLayer *scene_layer);
 void BKE_scene_base_flag_from_objects(struct Scene *scene);
diff --git a/source/blender/blenkernel/intern/mball.c b/source/blender/blenkernel/intern/mball.c
index f1e549b1400..f2c39d6cc72 100644
--- a/source/blender/blenkernel/intern/mball.c
+++ b/source/blender/blenkernel/intern/mball.c
@@ -320,7 +320,7 @@ bool BKE_mball_is_basis_for(Object *ob1, Object *ob2)
 void BKE_mball_properties_copy(Scene *scene, Object *active_object)
 {
 	Scene *sce_iter = scene;
-	BaseLegacy *base;
+	Base *base;
 	Object *ob;
 	MetaBall *active_mball = (MetaBall *)active_object->data;
 	int basisnr, obnr;
diff --git a/source/blender/blenkernel/intern/mball_tessellate.c b/source/blender/blenkernel/intern/mball_tessellate.c
index d8e3df239df..b4eff3f989f 100644
--- a/source/blender/blenkernel/intern/mball_tessellate.c
+++ b/source/blender/blenkernel/intern/mball_tessellate.c
@@ -1082,7 +1082,7 @@ static void polygonize(PROCESS *process)
 static void init_meta(const EvaluationContext *eval_ctx, PROCESS *process, Scene *scene, Object *ob)
 {
 	Scene *sce_iter = scene;
-	BaseLegacy *base;
+	Base *base;
 	Object *bob;
 	MetaBall *mb;
 	const MetaElem *ml;
diff --git a/source/blender/blenkernel/intern/scene.c b/source/blender/blenkernel/intern/scene.c
index 891aab77b08..b1cbf24f715 100644
--- a/source/blender/blenkernel/intern/scene.c
+++ b/source/blender/blenkernel/intern/scene.c
@@ -1153,7 +1153,7 @@ Scene *BKE_scene_set_name(Main *bmain, const char *name)
 /* Used by metaballs, return *all* objects (including duplis) existing in the scene (including scene's sets) */
 int BKE_scene_base_iter_next(
         const EvaluationContext *eval_ctx, SceneBaseIter *iter,
-        Scene **scene, int val, BaseLegacy **base, Object **ob)
+        Scene **scene, int val, Base **base, Object **ob)
 {
 	bool run_again = true;