Farewell Scene->base

While getting rid of Scene->base we got the following fixes:

* Fix "Convert To" operator
* Fix "NLA allowing to selected objects that are not selectable
* Fix scene.objects (readonly, no option to link/unlink)

Note: Collada needs to use the context SceneLayer for adding objects
however I added a placeholder, so Collada maintainers can fix this
properly.

1 files changed, 5 insertions, 4 deletions

diff --git a/source/blender/blenkernel/intern/camera.c b/source/blender/blenkernel/intern/camera.c
index ac004e58785..d9280a84678 100644
--- a/source/blender/blenkernel/intern/camera.c
+++ b/source/blender/blenkernel/intern/camera.c
@@ -49,6 +49,7 @@
 #include "BKE_camera.h"
 #include "BKE_object.h"
 #include "BKE_global.h"
+#include "BKE_layer.h"
 #include "BKE_library.h"
 #include "BKE_library_query.h"
 #include "BKE_library_remap.h"
@@ -885,9 +886,9 @@ static Object *camera_multiview_advanced(Scene *scene, Object *camera, const cha
 	}
 
 	if (name[0] != '\0') {
-		BaseLegacy *base = BKE_scene_base_find_by_name(scene, name);
-		if (base) {
-			return base->object;
+		Object *ob = BKE_scene_object_find_by_name(scene, name);
+		if (ob != NULL) {
+			return ob;
 		}
 	}
 
@@ -1018,4 +1019,4 @@ void BKE_camera_background_image_clear(Camera *cam)
 
 		bgpic = next_bgpic;
 	}
-}
\ No newline at end of file
+}