Commit: ea3aeb974f0df70ccca4f0d9166f0876f7adbed5
Author: Campbell Barton
Date: Tue Mar 17 15:35:22 2015 +1100
Branches: multiview
https://developer.blender.org/rBea3aeb974f0df70ccca4f0d9166f0876f7adbed5
Cleanup: API naming - use BKE_scene_multiview_*** prefix
===================================================================
M source/blender/blenkernel/BKE_scene.h
M source/blender/blenkernel/intern/camera.c
M source/blender/blenkernel/intern/image.c
M source/blender/blenkernel/intern/scene.c
M source/blender/blenkernel/intern/sequencer.c
M source/blender/compositor/nodes/COM_SplitViewerNode.cpp
M source/blender/compositor/nodes/COM_ViewerNode.cpp
M source/blender/compositor/operations/COM_ImageOperation.cpp
M
source/blender/compositor/operations/COM_OutputFileMultiViewOperation.cpp
M source/blender/compositor/operations/COM_OutputFileOperation.cpp
M source/blender/compositor/operations/COM_ViewerOperation.cpp
M source/blender/editors/render/render_internal.c
M source/blender/editors/render/render_opengl.c
M source/blender/editors/space_image/image_ops.c
M source/blender/editors/space_node/node_edit.c
M source/blender/editors/space_sequencer/sequencer_draw.c
M source/blender/editors/space_view3d/view3d_draw.c
M source/blender/render/intern/source/pipeline.c
M source/blender/render/intern/source/render_result.c
===================================================================
diff --git a/source/blender/blenkernel/BKE_scene.h
b/source/blender/blenkernel/BKE_scene.h
index 709b785..292e365 100644
--- a/source/blender/blenkernel/BKE_scene.h
+++ b/source/blender/blenkernel/BKE_scene.h
@@ -150,20 +150,20 @@ 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_scene_is_stereo3d(const struct RenderData *rd);
-size_t BKE_scene_num_views_get(const struct RenderData *rd);
-bool BKE_scene_render_view_active(const struct RenderData *rd, const struct
SceneRenderView *srv);
-bool BKE_scene_render_view_first(const struct RenderData *rd, const char
*viewname);
-bool BKE_scene_render_view_last(const struct RenderData *rd, const char
*viewname);
-struct SceneRenderView *BKE_scene_render_view_findindex(const struct
RenderData *rd, const int view_id);
-const char *BKE_scene_render_view_name_get(const struct RenderData *rd, const
int view_id);
-size_t BKE_scene_view_id_get(const struct RenderData *rd, const char
*viewname);
-void BKE_scene_view_filepath_get(const struct RenderData *rd, const char
*filepath, const char *view, char *r_filepath);
-const char *BKE_scene_view_suffix_get(const struct RenderData *rd, const char
*viewname);
-const char *BKE_scene_view_id_suffix_get(const struct RenderData *rd, const
size_t view_id);
-void BKE_scene_view_prefix_get(struct Scene *scene, const char *name, char
*rprefix, char **rext);
-void BKE_scene_videos_dimensions_get(const struct RenderData *rd, const size_t
width, const size_t height, size_t *r_width, size_t *r_height);
-size_t BKE_scene_num_videos_get(const struct RenderData *rd);
+bool BKE_scene_multiview_is_stereo3d(const struct RenderData *rd);
+bool BKE_scene_multiview_is_render_view_active(const struct RenderData
*rd, const struct SceneRenderView *srv);
+bool BKE_scene_multiview_is_render_view_first(const struct RenderData
*rd, const char *viewname);
+bool BKE_scene_multiview_is_render_view_last(const struct RenderData
*rd, const char *viewname);
+size_t BKE_scene_multiview_num_views_get(const struct RenderData *rd);
+struct SceneRenderView *BKE_scene_multiview_render_view_findindex(const struct
RenderData *rd, const int view_id);
+const char *BKE_scene_multiview_render_view_name_get(const struct RenderData
*rd, const int view_id);
+size_t BKE_scene_multiview_view_id_get(const struct RenderData *rd, const
char *viewname);
+void BKE_scene_multiview_view_filepath_get(const struct RenderData *rd,
const char *filepath, const char *view, char *r_filepath);
+const char *BKE_scene_multiview_view_suffix_get(const struct RenderData *rd,
const char *viewname);
+const char *BKE_scene_multiview_view_id_suffix_get(const struct RenderData
*rd, const size_t view_id);
+void BKE_scene_multiview_view_prefix_get(struct Scene *scene, const
char *name, char *rprefix, char **rext);
+void BKE_scene_multiview_videos_dimensions_get(const struct RenderData
*rd, const size_t width, const size_t height, size_t *r_width, size_t
*r_height);
+size_t BKE_scene_multiview_num_videos_get(const struct RenderData *rd);
#ifdef __cplusplus
}
diff --git a/source/blender/blenkernel/intern/camera.c
b/source/blender/blenkernel/intern/camera.c
index f9c849f..1ab8b91 100644
--- a/source/blender/blenkernel/intern/camera.c
+++ b/source/blender/blenkernel/intern/camera.c
@@ -877,7 +877,7 @@ Object *BKE_camera_multiview_render(Scene *scene, Object
*camera, const char *vi
return camera;
}
else { /* SCE_VIEWS_FORMAT_MULTIVIEW */
- const char *suffix = BKE_scene_view_suffix_get(&scene->r,
viewname);
+ const char *suffix =
BKE_scene_multiview_view_suffix_get(&scene->r, viewname);
return camera_multiview_advanced(scene, camera, suffix);
}
}
diff --git a/source/blender/blenkernel/intern/image.c
b/source/blender/blenkernel/intern/image.c
index 281cd1d..4226bfc 100644
--- a/source/blender/blenkernel/intern/image.c
+++ b/source/blender/blenkernel/intern/image.c
@@ -2359,7 +2359,7 @@ static void image_viewer_create_views(const RenderData
*rd, Image *ima)
{
SceneRenderView *srv;
for (srv = rd->views.first; srv; srv = srv->next) {
- if (BKE_scene_render_view_active(rd, srv) == false)
+ if (BKE_scene_multiview_is_render_view_active(rd, srv) == false)
continue;
image_add_view(ima, srv->name, "");
}
@@ -2372,7 +2372,7 @@ void BKE_image_verify_viewer_views(const RenderData *rd,
Image *ima, ImageUser *
BLI_lock_thread(LOCK_DRAW_IMAGE);
- if (BKE_scene_is_stereo3d(rd)) {
+ if (BKE_scene_multiview_is_stereo3d(rd)) {
ima->flag |= IMA_IS_STEREO;
ima->flag |= IMA_IS_MULTIVIEW;
}
@@ -2383,14 +2383,14 @@ void BKE_image_verify_viewer_views(const RenderData
*rd, Image *ima, ImageUser *
}
/* see if all scene render views are in the image view list */
- do_reset = (BKE_scene_num_views_get(rd) !=
BLI_listbase_count(&ima->views));
+ do_reset = (BKE_scene_multiview_num_views_get(rd) !=
BLI_listbase_count(&ima->views));
if (!do_reset) {
SceneRenderView *srv;
ImageView *iv;
for (iv = ima->views.first; iv; iv = iv->next) {
srv = BLI_findstring(&rd->views, iv->name,
offsetof(SceneRenderView, name));
- if ((srv == NULL) || (BKE_scene_render_view_active(rd,
srv) == false)) {
+ if ((srv == NULL) ||
(BKE_scene_multiview_is_render_view_active(rd, srv) == false)) {
do_reset = true;
break;
}
@@ -4487,7 +4487,7 @@ static void image_update_views_format(Image *ima,
ImageUser *iuser)
char *name = ima->name;
char *ext = NULL;
- BKE_scene_view_prefix_get(scene, name, prefix, &ext);
+ BKE_scene_multiview_view_prefix_get(scene, name, prefix, &ext);
if (prefix[0] == '\0') {
goto monoview;
@@ -4495,7 +4495,7 @@ static void image_update_views_format(Image *ima,
ImageUser *iuser)
/* create all the image views */
for (srv = scene->r.views.first; srv; srv = srv->next) {
- if (BKE_scene_render_view_active(&scene->r, srv)) {
+ if
(BKE_scene_multiview_is_render_view_active(&scene->r, srv)) {
char filepath[FILE_MAX];
BLI_snprintf(filepath, sizeof(filepath),
"%s%s%s", prefix, srv->suffix, ext);
image_add_view(ima, srv->name, filepath);
@@ -4528,7 +4528,7 @@ static void image_update_views_format(Image *ima,
ImageUser *iuser)
/* all good */
if (BLI_listbase_count_ex(&ima->views, 2) > 1) {
ima->flag |= IMA_IS_MULTIVIEW;
- if (BKE_scene_is_stereo3d(&scene->r))
+ if (BKE_scene_multiview_is_stereo3d(&scene->r))
ima->flag |= IMA_IS_STEREO;
}
else {
diff --git a/source/blender/blenkernel/intern/scene.c
b/source/blender/blenkernel/intern/scene.c
index 61cc81b..cbb02ca 100644
--- a/source/blender/blenkernel/intern/scene.c
+++ b/source/blender/blenkernel/intern/scene.c
@@ -2126,7 +2126,7 @@ double BKE_scene_unit_scale(const UnitSettings *unit,
const int unit_type, doubl
/******************** multiview *************************/
-size_t BKE_scene_num_views_get(const RenderData *rd)
+size_t BKE_scene_multiview_num_views_get(const RenderData *rd)
{
SceneRenderView *srv;
size_t totviews = 0;
@@ -2153,7 +2153,7 @@ size_t BKE_scene_num_views_get(const RenderData *rd)
return totviews;
}
-bool BKE_scene_is_stereo3d(const RenderData *rd)
+bool BKE_scene_multiview_is_stereo3d(const RenderData *rd)
{
SceneRenderView *srv[2];
@@ -2168,7 +2168,7 @@ bool BKE_scene_is_stereo3d(const RenderData *rd)
}
/* return whether to render this SceneRenderView */
-bool BKE_scene_render_view_active(const RenderData *rd, const SceneRenderView
*srv)
+bool BKE_scene_multiview_is_render_view_active(const RenderData *rd, const
SceneRenderView *srv)
{
if (srv == NULL)
return false;
@@ -2192,8 +2192,8 @@ bool BKE_scene_render_view_active(const RenderData *rd,
const SceneRenderView *s
return false;
}
-/* return true if viewname is the first or if the name is NULL or not found*/
-bool BKE_scene_render_view_first(const RenderData *rd, const char *viewname)
+/* return true if viewname is the first or if the name is NULL or not found */
+bool BKE_scene_multiview_is_render_view_first(const RenderData *rd, const char
*viewname)
{
SceneRenderView *srv;
@@ -2204,7 +2204,7 @@ bool BKE_scene_render_view_first(const RenderData *rd,
const char *viewname)
return true;
for (srv = rd->views.first; srv; srv = srv->next) {
- if (BKE_scene_render_view_active(rd, srv)) {
+ if (BKE_scene_multiview_is_render_view_active(rd, srv)) {
return STREQ(viewname, srv->name);
}
}
@@ -2213,7 +2213,7 @@ bool BKE_scene_render_view_first(const RenderData *rd,
const char *viewname)
}
/* return true if viewname is the last or if the name is NULL or not found */
-bool BKE_scene_render_view_last(const RenderData *rd, const char *viewname)
+bool BKE_scene_multiview_is_render_view_last(const RenderData *rd, const char
*viewname)
{
SceneRenderView *srv;
@@ -2224,7 +2224,7 @@ bool BKE_scene_render_view_last(const RenderData *rd,
const char *viewname)
return true;
for (srv = rd->views.last; srv; srv = srv->prev) {
- if (BKE_scene_render_view_active(rd, srv)) {
+ if (BKE_scene_multiview_is_render_view_active(rd, srv)) {
return STREQ(viewname, srv->name);
}
}
@@ -2232,7 +2232,7 @@ bool BKE_scene_render_view_last(const RenderData *rd,
const char *viewname)
return true;
}
-SceneRenderView *BKE_scene_render_view_findindex(const RenderData *rd, const
int view_id)
+SceneRenderView *BKE_scene_multiview_render_view_findindex(const RenderData
*rd, const int view_id)
{
SceneRenderView *srv;
size_t nr;
@@ -2242,7 +2242,7 @@ SceneRenderView *BKE_scene_render_view_findindex(const
RenderData *rd, const int
nr = 0;
for (srv = rd->views.first, nr = 0; srv; srv = srv->next) {
- if (BKE_scene_render_view_active(rd, srv)) {
+ if (BKE_scene_multiview_is_render_view_active(rd, srv)) {
if (nr++ == view_id)
return srv;
}
@@ -2250,9 +2250,9 @@ SceneRenderView *BKE_scene_render_view_findindex(const
RenderData *rd, const int
return srv;
}
-const char *BKE_scene_render_view_name_get(const RenderData *rd, const int
view_id)
+const char *BKE_scene_multiview_render_view_name_get(const RenderData *rd,
const int view_id)
{
- SceneRenderView *srv = B
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
