[Bf-blender-cvs] [055c4fe] multiview: Rename scene multiview util functions

[Dalai Felinto]

Commit: 055c4feeb542faf6545abc2e4e0cdd1af34e6f64
Author: Dalai Felinto
Date:   Fri Aug 29 10:59:42 2014 +0200
Branches: multiview
https://developer.blender.org/rB055c4feeb542faf6545abc2e4e0cdd1af34e6f64

Rename scene multiview util functions

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

M	source/blender/blenkernel/BKE_scene.h
M	source/blender/blenkernel/intern/scene.c
M	source/blender/compositor/nodes/COM_SplitViewerNode.cpp
M	source/blender/compositor/nodes/COM_ViewerNode.cpp
M	source/blender/compositor/operations/COM_OutputFileMultiViewOperation.cpp
M	source/blender/editors/render/render_opengl.c
M	source/blender/editors/space_node/node_edit.c
M	source/blender/render/intern/source/pipeline.c

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

diff --git a/source/blender/blenkernel/BKE_scene.h b/source/blender/blenkernel/BKE_scene.h
index af42e69..69e5a32 100644
--- a/source/blender/blenkernel/BKE_scene.h
+++ b/source/blender/blenkernel/BKE_scene.h
@@ -146,8 +146,8 @@ int BKE_render_num_threads(const struct RenderData *r);
 double BKE_scene_unit_scale(const struct UnitSettings *unit, const int unit_type, double value);
 
 /* multiview */
-bool BKE_render_is_stereo3d(const struct RenderData *rd);
-size_t BKE_render_num_views(const struct RenderData *rd);
+bool BKE_scene_is_stereo3d(const struct RenderData *rd);
+size_t BKE_scene_num_views(const struct RenderData *rd);
 bool BKE_scene_render_view_active(const struct RenderData *rd, const struct SceneRenderView *srv);
 struct SceneRenderView *BKE_scene_render_view_findindex(const struct RenderData *rd, const int view_id);
 
diff --git a/source/blender/blenkernel/intern/scene.c b/source/blender/blenkernel/intern/scene.c
index 019a340..6e65b67 100644
--- a/source/blender/blenkernel/intern/scene.c
+++ b/source/blender/blenkernel/intern/scene.c
@@ -2057,7 +2057,7 @@ double BKE_scene_unit_scale(const UnitSettings *unit, const int unit_type, doubl
 
 /******************** multiview *************************/
 
-size_t BKE_render_num_views(const RenderData *rd)
+size_t BKE_scene_num_views(const RenderData *rd)
 {
 	SceneRenderView *srv;
 	size_t totviews	= 0;
@@ -2080,7 +2080,7 @@ size_t BKE_render_num_views(const RenderData *rd)
 	return totviews;
 }
 
-bool BKE_render_is_stereo3d(const RenderData *rd)
+bool BKE_scene_is_stereo3d(const RenderData *rd)
 {
 	SceneRenderView *srv[2];
 
diff --git a/source/blender/compositor/nodes/COM_SplitViewerNode.cpp b/source/blender/compositor/nodes/COM_SplitViewerNode.cpp
index 18a2f76..11c3d9f 100644
--- a/source/blender/compositor/nodes/COM_SplitViewerNode.cpp
+++ b/source/blender/compositor/nodes/COM_SplitViewerNode.cpp
@@ -75,7 +75,7 @@ void SplitViewerNode::convertToOperations(NodeConverter &converter, const Compos
 
 	if (image && (context.getViewId() == 0)) {
 		BLI_lock_thread(LOCK_DRAW_IMAGE);
-		if (BKE_render_is_stereo3d(context.getRenderData())) {
+		if (BKE_scene_is_stereo3d(context.getRenderData())) {
 			image->flag |= IMA_IS_STEREO;
 		}
 		else {
@@ -83,7 +83,7 @@ void SplitViewerNode::convertToOperations(NodeConverter &converter, const Compos
 			imageUser->flag &= ~IMA_SHOW_STEREO;
 		}
 
-		size_t num_views = BKE_render_num_views(context.getRenderData());
+		size_t num_views = BKE_scene_num_views(context.getRenderData());
 		size_t num_caches = BKE_image_cache_count(image);
 
 		if (num_views != num_caches) {
diff --git a/source/blender/compositor/nodes/COM_ViewerNode.cpp b/source/blender/compositor/nodes/COM_ViewerNode.cpp
index 7505fc1..1f625b4 100644
--- a/source/blender/compositor/nodes/COM_ViewerNode.cpp
+++ b/source/blender/compositor/nodes/COM_ViewerNode.cpp
@@ -82,7 +82,7 @@ void ViewerNode::convertToOperations(NodeConverter &converter, const CompositorC
 
 	if (image && (context.getViewId() == 0)) {
 		BLI_lock_thread(LOCK_DRAW_IMAGE);
-		if (BKE_render_is_stereo3d(context.getRenderData())) {
+		if (BKE_scene_is_stereo3d(context.getRenderData())) {
 			image->flag |= IMA_IS_STEREO;
 		}
 		else {
@@ -90,7 +90,7 @@ void ViewerNode::convertToOperations(NodeConverter &converter, const CompositorC
 			imageUser->flag &= ~IMA_SHOW_STEREO;
 		}
 
-		size_t num_views = BKE_render_num_views(context.getRenderData());
+		size_t num_views = BKE_scene_num_views(context.getRenderData());
 		size_t num_caches = BKE_image_cache_count(image);
 
 		if (num_views != num_caches) {
diff --git a/source/blender/compositor/operations/COM_OutputFileMultiViewOperation.cpp b/source/blender/compositor/operations/COM_OutputFileMultiViewOperation.cpp
index 5fac380..429688d 100644
--- a/source/blender/compositor/operations/COM_OutputFileMultiViewOperation.cpp
+++ b/source/blender/compositor/operations/COM_OutputFileMultiViewOperation.cpp
@@ -271,7 +271,7 @@ void OutputStereoOperation::deinitExecution()
 		this->m_outputBuffer = NULL;
 
 		/* create stereo ibuf */
-		if (this->m_actview >= BKE_render_num_views(this->m_rd) - 1) {
+		if (this->m_actview >= BKE_scene_num_views(this->m_rd) - 1) {
 			ImBuf *ibuf[3] = {NULL};
 			const char *names[2] = {STEREO_LEFT_NAME, STEREO_RIGHT_NAME};
 			Main *bmain = G.main; /* TODO, have this passed along */
diff --git a/source/blender/editors/render/render_opengl.c b/source/blender/editors/render/render_opengl.c
index f0123e9..60ab1a4 100644
--- a/source/blender/editors/render/render_opengl.c
+++ b/source/blender/editors/render/render_opengl.c
@@ -229,7 +229,7 @@ static void screen_opengl_views_setup(OGLRender *oglrender)
 	}
 
 	BLI_lock_thread(LOCK_DRAW_IMAGE);
-	if (BKE_render_is_stereo3d(rd)) {
+	if (BKE_scene_is_stereo3d(rd)) {
 		oglrender->ima->flag |= IMA_IS_STEREO;
 	}
 	else {
diff --git a/source/blender/editors/space_node/node_edit.c b/source/blender/editors/space_node/node_edit.c
index bd785f0..53d6c18 100644
--- a/source/blender/editors/space_node/node_edit.c
+++ b/source/blender/editors/space_node/node_edit.c
@@ -253,7 +253,7 @@ static void compo_startjob(void *cjv, short *stop, short *do_update, float *prog
 	// XXX BIF_store_spare();
 	/* 1 is do_previews */
 
-	numviews = BKE_render_num_views(&cj->scene->r);
+	numviews = BKE_scene_num_views(&cj->scene->r);
 	for (nr = 0; nr < numviews; nr++) {
 		ntreeCompositExecTree(cj->scene, ntree, &cj->scene->r, false, true, &scene->view_settings, &scene->display_settings, nr);
 	}
diff --git a/source/blender/render/intern/source/pipeline.c b/source/blender/render/intern/source/pipeline.c
index a51bc7a..6535527 100644
--- a/source/blender/render/intern/source/pipeline.c
+++ b/source/blender/render/intern/source/pipeline.c
@@ -3362,7 +3362,7 @@ static size_t get_videos_count(RenderData *rd)
 
 	/* R_IMF_VIEWS_INDIVIDUAL */
 	else {
-		return BKE_render_num_views(rd);
+		return BKE_scene_num_views(rd);
 	}
 }