[Bf-blender-cvs] [f955759] multiview: Moving RE_ render result + multiview related functions to renderresult.c and related cleanup

[Dalai Felinto]

Commit: f955759ba87ec3a519371fae17e0a774578018f0
Author: Dalai Felinto
Date:   Tue Aug 12 13:48:30 2014 +0200
Branches: multiview
https://developer.blender.org/rBf955759ba87ec3a519371fae17e0a774578018f0

Moving RE_ render result + multiview related functions to renderresult.c
and related cleanup

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

M	source/blender/render/extern/include/RE_pipeline.h
M	source/blender/render/intern/source/pipeline.c
M	source/blender/render/intern/source/render_result.c

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

diff --git a/source/blender/render/extern/include/RE_pipeline.h b/source/blender/render/extern/include/RE_pipeline.h
index 6a9507c..6aac105 100644
--- a/source/blender/render/extern/include/RE_pipeline.h
+++ b/source/blender/render/extern/include/RE_pipeline.h
@@ -217,14 +217,7 @@ void RE_AcquiredResultGet32(struct Render *re, struct RenderResult *result, unsi
 
 struct RenderLayer *RE_GetRenderLayer(struct RenderResult *rr, const char *name);
 float *RE_RenderLayerGetPass(struct RenderLayer *rl, int passtype, int view_id);
-float *RE_RenderViewGetRectf(struct RenderResult *rr, int view_id);
-float *RE_RenderViewGetRectz(struct RenderResult *rr, int view_id);
-int *RE_RenderViewGetRect32(struct RenderResult *rr, int view_id);
-void RE_RenderViewSetRectf(RenderResult *res, int view_id, float *rect);
-void RE_RenderViewSetRectz(RenderResult *res, int view_id, float *rect);
 int RE_GetActiveViewId(struct Render *re);
-int RE_HasFakeLayer(RenderResult *res);
-bool RE_RenderResult_is_stereo(RenderResult *res);
 
 /* obligatory initialize call, disprect is optional */
 void RE_InitState(struct Render *re, struct Render *source, struct RenderData *rd,
@@ -339,5 +332,16 @@ bool RE_is_rendering_allowed(struct Scene *scene, struct Object *camera_override
 
 bool RE_allow_render_generic_object(struct Object *ob);
 
+/******* defined in render_result.c *********/
+
+bool RE_HasFakeLayer(RenderResult *res);
+bool RE_RenderResult_is_stereo(RenderResult *res);
+
+float *RE_RenderViewGetRectf(struct RenderResult *rr, const int view_id);
+float *RE_RenderViewGetRectz(struct RenderResult *rr, const int view_id);
+int *RE_RenderViewGetRect32(struct RenderResult *rr, const int view_id);
+void RE_RenderViewSetRectf(struct RenderResult *res, const int view_id, float *rect);
+void RE_RenderViewSetRectz(struct RenderResult *res, const int view_id, float *rect);
+
 #endif /* __RE_PIPELINE_H__ */
 
diff --git a/source/blender/render/intern/source/pipeline.c b/source/blender/render/intern/source/pipeline.c
index 8897494..e706bc5 100644
--- a/source/blender/render/intern/source/pipeline.c
+++ b/source/blender/render/intern/source/pipeline.c
@@ -199,93 +199,6 @@ int RE_GetActiveViewId(Render *re)
 	return re->actview;
 }
 
-int RE_HasFakeLayer(RenderResult *res)
-{
-	RenderView *rv;
-
-	if (res == NULL)
-		return false;
-
-	rv = (RenderView *)res->views.first;
-	if (rv == NULL)
-		return false;
-
-	return (rv->rect32 || rv->rectf);
-}
-
-bool RE_RenderResult_is_stereo(RenderResult *res)
-{
-	if (! BLI_findstring(&res->views, STEREO_LEFT_NAME, offsetof(RenderView, name)))
-		return false;
-
-	if (! BLI_findstring(&res->views, STEREO_RIGHT_NAME, offsetof(RenderView, name)))
-		return false;
-
-	return true;
-}
-
-void RE_RenderViewSetRectf(RenderResult *res, int view_id, float *rect)
-{
-	RenderView *rv;
-	int nr=0;
-
-	for (nr=0, rv = res->views.first; rv; rv = rv->next, nr++) {
-		if (nr == view_id) {
-			rv->rectf = rect;
-			return;
-		}
-	}
-}
-
-void RE_RenderViewSetRectz(RenderResult *res, int view_id, float *rect)
-{
-	RenderView *rv;
-	int nr=0;
-
-	for (nr=0, rv = res->views.first; rv; rv = rv->next, nr++) {
-		if (nr == view_id) {
-			rv->rectz = rect;
-			return;
-		}
-	}
-}
-
-float *RE_RenderViewGetRectz(RenderResult *res, int view_id)
-{
-	RenderView *rv;
-	size_t nr = 0;
-
-	for (nr=0, rv = res->views.first; rv; rv = rv->next, nr++)
-		if (nr == view_id)
-			return rv->rectz;
-
-	return res->rectz;
-}
-
-float *RE_RenderViewGetRectf(RenderResult *res, int view_id)
-{
-	RenderView *rv;
-	size_t nr = 0;
-
-	for (nr = 0, rv = res->views.first; rv; rv = rv->next, nr++)
-		if (nr == view_id)
-			return rv->rectf;
-
-	return res->rectf;
-}
-
-int *RE_RenderViewGetRect32(RenderResult *res, int view_id)
-{
-	RenderView *rv;
-	size_t nr;
-
-	for (nr = 0, rv = res->views.first; rv; rv = rv->next, nr++)
-		if (nr == view_id)
-			return rv->rect32;
-
-	return res->rect32;
-}
-
 float *RE_RenderLayerGetPass(RenderLayer *rl, int passtype, int view_id)
 {
 	RenderPass *rpass;
diff --git a/source/blender/render/intern/source/render_result.c b/source/blender/render/intern/source/render_result.c
index 5184658..d61d23d 100644
--- a/source/blender/render/intern/source/render_result.c
+++ b/source/blender/render/intern/source/render_result.c
@@ -1508,3 +1508,94 @@ void render_result_rect_get_pixels(RenderResult *rr, unsigned int *rect, int rec
 		memset(rect, 0, sizeof(int) * rectx * recty);
 }
 
+
+/*************************** multiview functions *****************************/
+
+bool RE_HasFakeLayer(RenderResult *res)
+{
+	RenderView *rv;
+
+	if (res == NULL)
+		return false;
+
+	rv = (RenderView *)res->views.first;
+	if (rv == NULL)
+		return false;
+
+	return (rv->rect32 || rv->rectf);
+}
+
+bool RE_RenderResult_is_stereo(RenderResult *res)
+{
+	if (! BLI_findstring(&res->views, STEREO_LEFT_NAME, offsetof(RenderView, name)))
+		return false;
+
+	if (! BLI_findstring(&res->views, STEREO_RIGHT_NAME, offsetof(RenderView, name)))
+		return false;
+
+	return true;
+}
+
+void RE_RenderViewSetRectf(RenderResult *res, const int view_id, float *rect)
+{
+	RenderView *rv;
+	size_t nr = 0;
+
+	for (nr = 0, rv = res->views.first; rv; rv = rv->next, nr++) {
+		if (nr == view_id) {
+			rv->rectf = rect;
+			return;
+		}
+	}
+}
+
+void RE_RenderViewSetRectz(RenderResult *res, const int view_id, float *rect)
+{
+	RenderView *rv;
+	size_t nr = 0;
+
+	for (nr = 0, rv = res->views.first; rv; rv = rv->next, nr++) {
+		if (nr == view_id) {
+			rv->rectz = rect;
+			return;
+		}
+	}
+}
+
+float *RE_RenderViewGetRectz(RenderResult *res, const int view_id)
+{
+	RenderView *rv;
+	size_t nr = 0;
+
+	for (nr = 0, rv = res->views.first; rv; rv = rv->next, nr++)
+		if (nr == view_id)
+			return rv->rectz;
+
+	return res->rectz;
+}
+
+float *RE_RenderViewGetRectf(RenderResult *res, const int view_id)
+{
+	RenderView *rv;
+	size_t nr = 0;
+
+	for (nr = 0, rv = res->views.first; rv; rv = rv->next, nr++)
+		if (nr == view_id)
+			return rv->rectf;
+
+	return res->rectf;
+}
+
+int *RE_RenderViewGetRect32(RenderResult *res, const int view_id)
+{
+	RenderView *rv;
+	size_t nr;
+
+	for (nr = 0, rv = res->views.first; rv; rv = rv->next, nr++)
+		if (nr == view_id)
+			return rv->rect32;
+
+	return res->rect32;
+}
+
+