[Bf-blender-cvs] [e11fd35] multiview: Fix for off-by-2 size with BKE_camera_multiview_advanced

[Campbell Barton]

Commit: e11fd354d4e2cd094e552c5b131b9344ff46bda3
Author: Campbell Barton
Date:   Thu Sep 18 18:53:00 2014 +1000
Branches: multiview
https://developer.blender.org/rBe11fd354d4e2cd094e552c5b131b9344ff46bda3

Fix for off-by-2 size with BKE_camera_multiview_advanced

Also move scene-base search into its own function.

===================================================================

M	source/blender/blenkernel/BKE_scene.h
M	source/blender/blenkernel/intern/camera.c
M	source/blender/blenkernel/intern/scene.c

===================================================================

diff --git a/source/blender/blenkernel/BKE_scene.h b/source/blender/blenkernel/BKE_scene.h
index 7ab63a5..5b4c7ee 100644
--- a/source/blender/blenkernel/BKE_scene.h
+++ b/source/blender/blenkernel/BKE_scene.h
@@ -72,6 +72,7 @@ void BKE_scene_free(struct Scene *sce);
 struct Scene *BKE_scene_add(struct Main *bmain, const char *name);
 
 /* base functions */
+struct Base *BKE_scene_base_find_by_name(struct Scene *scene, const char *name);
 struct Base *BKE_scene_base_find(struct Scene *scene, struct Object *ob);
 struct Base *BKE_scene_base_add(struct Scene *sce, struct Object *ob);
 void         BKE_scene_base_unlink(struct Scene *sce, struct Base *base);
diff --git a/source/blender/blenkernel/intern/camera.c b/source/blender/blenkernel/intern/camera.c
index 92e7331..4c8d0f5 100644
--- a/source/blender/blenkernel/intern/camera.c
+++ b/source/blender/blenkernel/intern/camera.c
@@ -49,6 +49,7 @@
 #include "BKE_global.h"
 #include "BKE_library.h"
 #include "BKE_main.h"
+#include "BKE_scene.h"
 #include "BKE_screen.h"
 
 /****************************** Camera Datablock *****************************/
@@ -739,7 +740,8 @@ Object *BKE_camera_multiview_advanced(Scene *scene, RenderData *rd, Object *came
 {
 	SceneRenderView *srv;
 	char name[MAX_NAME];
-	const int len_name = strlen(camera->id.name);
+	const char *camera_name = camera->id.name + 2;
+	const int len_name = strlen(camera_name);
 
 	name[0] = '\0';
 
@@ -749,20 +751,16 @@ Object *BKE_camera_multiview_advanced(Scene *scene, RenderData *rd, Object *came
 		if (len_name < len_suffix)
 			continue;
 
-		if (STREQ(camera->id.name + (len_name - len_suffix), srv->suffix)) {
-			BLI_snprintf(name, sizeof(name), "%.*s%s", (len_name - len_suffix), camera->id.name, suffix);
+		if (STREQ(camera_name + (len_name - len_suffix), srv->suffix)) {
+			BLI_snprintf(name, sizeof(name), "%.*s%s", (len_name - len_suffix), camera_name, suffix);
 			break;
 		}
 	}
 
 	if (name[0] != '\0') {
-		Base *base;
-		Object *ob;
-		for (base = scene->base.first; base; base = base->next) {
-			ob = base->object;
-			if (strcmp(ob->id.name, name) == 0) {
-				return ob;
-			}
+		Base *base = BKE_scene_base_find_by_name(scene, name);
+		if (base) {
+			return base->object;
 		}
 	}
 
diff --git a/source/blender/blenkernel/intern/scene.c b/source/blender/blenkernel/intern/scene.c
index bc5dc7a..6d2d437 100644
--- a/source/blender/blenkernel/intern/scene.c
+++ b/source/blender/blenkernel/intern/scene.c
@@ -688,6 +688,19 @@ Scene *BKE_scene_add(Main *bmain, const char *name)
 	return sce;
 }
 
+Base *BKE_scene_base_find_by_name(struct Scene *scene, const char *name)
+{
+	Base *base;
+
+	for (base = scene->base.first; base; base = base->next) {
+		if (STREQ(base->object->id.name + 2, name)) {
+			break;
+		}
+	}
+
+	return base;
+}
+
 Base *BKE_scene_base_find(Scene *scene, Object *ob)
 {
 	return BLI_findptr(&scene->base, ob, offsetof(Base, object));