[Bf-blender-cvs] [293b795] multiview: From review: renaming functions: adding _get
Dalai Felinto
noreply at git.blender.org
Tue Nov 25 18:56:48 CET 2014
Commit: 293b795e9bed58c4d5bd6b7b9b3fb812a967b4db
Author: Dalai Felinto
Date: Mon Nov 24 17:19:13 2014 -0200
Branches: multiview
https://developer.blender.org/rB293b795e9bed58c4d5bd6b7b9b3fb812a967b4db
>From review: renaming functions: adding _get
===================================================================
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/operations/COM_ImageOperation.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_sequencer/sequencer_draw.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 8fa79d0..4104582 100644
--- a/source/blender/blenkernel/BKE_scene.h
+++ b/source/blender/blenkernel/BKE_scene.h
@@ -150,18 +150,18 @@ double BKE_scene_unit_scale(const struct UnitSettings *unit, const int unit_type
/* multiview */
bool BKE_scene_is_stereo3d(const struct RenderData *rd);
-size_t BKE_scene_num_views(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(const struct RenderData *rd, const int view_id);
-size_t BKE_scene_view_get_id(const struct RenderData *rd, const char *viewname);
-void BKE_scene_view_get_filepath(const struct RenderData *rd, const char *filepath, const char *view, char *r_filepath);
-const char *BKE_scene_view_get_suffix(const struct RenderData *rd, const char *viewname);
-void BKE_scene_view_get_prefix(struct Scene *scene, const char *name, char *rprefix, char **rext);
-void BKE_scene_videos_dimensions(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(const struct RenderData *rd);
+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);
+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);
#ifdef __cplusplus
}
diff --git a/source/blender/blenkernel/intern/camera.c b/source/blender/blenkernel/intern/camera.c
index 4340d66..497e078 100644
--- a/source/blender/blenkernel/intern/camera.c
+++ b/source/blender/blenkernel/intern/camera.c
@@ -781,7 +781,7 @@ Object *BKE_camera_render(Scene *scene, Object *camera, const char *viewname)
return camera;
}
else { /* SCE_VIEWS_SETUP_ADVANCED */
- const char *suffix = BKE_scene_view_get_suffix(&scene->r, viewname);
+ const char *suffix = BKE_scene_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 2529272..f1f3aa9 100644
--- a/source/blender/blenkernel/intern/image.c
+++ b/source/blender/blenkernel/intern/image.c
@@ -941,7 +941,7 @@ static void image_memorypack_multiview(Scene *scene, Image *ima)
/* if the image was a R_IMF_VIEWS_STEREO_3D we need to create
* new names for the new individual views */
if (totfiles == 1)
- BKE_scene_view_get_filepath(&scene->r, ima->name, iv->name, iv->filepath);
+ BKE_scene_view_filepath_get(&scene->r, ima->name, iv->name, iv->filepath);
IMB_saveiff(ibuf, iv->filepath, IB_rect | IB_mem);
@@ -2393,7 +2393,7 @@ 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(rd) != BLI_listbase_count(&ima->views));
+ do_reset = (BKE_scene_num_views_get(rd) != BLI_listbase_count(&ima->views));
if (!do_reset) {
SceneRenderView *srv;
ImageView *iv;
@@ -4450,7 +4450,7 @@ static void image_update_views_format(Scene *scene, Image *ima)
char *name = ima->name;
char *ext = NULL;
- BKE_scene_view_get_prefix(scene, name, prefix, &ext);
+ BKE_scene_view_prefix_get(scene, name, prefix, &ext);
if (prefix[0] == '\0') {
goto monoview;
diff --git a/source/blender/blenkernel/intern/scene.c b/source/blender/blenkernel/intern/scene.c
index 57727a1..fe322fa 100644
--- a/source/blender/blenkernel/intern/scene.c
+++ b/source/blender/blenkernel/intern/scene.c
@@ -2120,7 +2120,7 @@ double BKE_scene_unit_scale(const UnitSettings *unit, const int unit_type, doubl
/******************** multiview *************************/
-size_t BKE_scene_num_views(const RenderData *rd)
+size_t BKE_scene_num_views_get(const RenderData *rd)
{
SceneRenderView *srv;
size_t totviews = 0;
@@ -2240,7 +2240,7 @@ SceneRenderView *BKE_scene_render_view_findindex(const RenderData *rd, const int
return srv;
}
-const char *BKE_scene_render_view_name(const RenderData *rd, const int view_id)
+const char *BKE_scene_render_view_name_get(const RenderData *rd, const int view_id)
{
SceneRenderView *srv = BKE_scene_render_view_findindex(rd, view_id);
@@ -2250,7 +2250,7 @@ const char *BKE_scene_render_view_name(const RenderData *rd, const int view_id)
return "";
}
-size_t BKE_scene_view_get_id(const RenderData *rd, const char *viewname)
+size_t BKE_scene_view_id_get(const RenderData *rd, const char *viewname)
{
SceneRenderView *srv;
size_t nr;
@@ -2281,7 +2281,7 @@ size_t BKE_scene_view_get_id(const RenderData *rd, const char *viewname)
* into the file name (e.g., Image_L.jpg). That allows for the user to re-render
* individual views.
**/
-void BKE_scene_view_get_filepath(const RenderData *rd, const char *filepath, const char *viewname, char *r_filepath)
+void BKE_scene_view_filepath_get(const RenderData *rd, const char *filepath, const char *viewname, char *r_filepath)
{
SceneRenderView *srv;
char suffix[FILE_MAX];
@@ -2296,7 +2296,7 @@ void BKE_scene_view_get_filepath(const RenderData *rd, const char *filepath, con
BLI_path_view(r_filepath, suffix);
}
-const char *BKE_scene_view_get_suffix(const RenderData *rd, const char *viewname)
+const char *BKE_scene_view_suffix_get(const RenderData *rd, const char *viewname)
{
SceneRenderView *srv;
@@ -2310,7 +2310,7 @@ const char *BKE_scene_view_get_suffix(const RenderData *rd, const char *viewname
return viewname;
}
-void BKE_scene_view_get_prefix(Scene *scene, const char *name, char *rprefix, char **rext)
+void BKE_scene_view_prefix_get(Scene *scene, const char *name, char *rprefix, char **rext)
{
SceneRenderView *srv;
size_t index_act;
@@ -2334,7 +2334,7 @@ void BKE_scene_view_get_prefix(Scene *scene, const char *name, char *rprefix, ch
}
}
-void BKE_scene_videos_dimensions(const RenderData *rd, const size_t width, const size_t height, size_t *r_width, size_t *r_height)
+void BKE_scene_videos_dimensions_get(const RenderData *rd, const size_t width, const size_t height, size_t *r_width, size_t *r_height)
{
if ((rd->scemode & R_MULTIVIEW) &&
rd->im_format.views_format == R_IMF_VIEWS_STEREO_3D)
@@ -2347,7 +2347,7 @@ void BKE_scene_videos_dimensions(const RenderData *rd, const size_t width, const
}
}
-size_t BKE_scene_num_videos(const RenderData *rd)
+size_t BKE_scene_num_videos_get(const RenderData *rd)
{
if (BKE_imtype_is_movie(rd->im_format.imtype) == false)
return 0;
@@ -2360,6 +2360,6 @@ size_t BKE_scene_num_videos(const RenderData *rd)
/* R_IMF_VIEWS_INDIVIDUAL */
else {
- return BKE_scene_num_views(rd);
+ return BKE_scene_num_views_get(rd);
}
}
diff --git a/source/blender/blenkernel/intern/sequencer.c b/source/blender/blenkernel/intern/sequencer.c
index 68897d3..105c30d 100644
--- a/source/blender/blenkernel/intern/sequencer.c
+++ b/source/blender/blenkernel/intern/sequencer.c
@@ -788,8 +788,8 @@ void BKE_sequence_calc(Scene *scene, Sequence *seq)
static void seq_multiview_name(Scene *scene, const size_t view_id, const char *prefix, const char *ext, char *r_path)
{
- const char *viewname = BKE_scene_render_view_name(&scene->r, view_id);
- const char *suffix = BKE_scene_view_get_suffix(&scene->r, viewname);
+ const char *viewname = BKE_scene_render_view_name_get(&scene->r, view_id);
+ const char *suffix = BKE_scene_view_suffix_get(&scene->r, viewname);
sprintf(r_path, "%s%s%s", prefix, suffix, ext);
}
@@ -845,7 +845,7 @@ void BKE_sequence_reload_new_file(Scene *scene, Sequence *seq, const bool lock_r
size_t totfiles = seq_num_files(scene, seq->views_format);
int i = 0;
- BKE_scene_view_get_prefix(scene, path, prefix, &ext);
+ BKE_scene_view_prefix_get(scene, path, prefix, &ext);
if (prefix[0] == '\0')
goto monoview;
@@ -1412,7 +1412,7 @@ static size_t seq_num_files(Scene *scene, char views_format)
}
/* R_IMF_VIEWS_INDIVIDUAL */
else {
- return BKE_scene_num_views(&scene->r);
+ return BKE_scene_num_views_get(&scene->r);
}
}
@@ -1447,14 +1447,14 @@ static void seq_open_anim_file(Scene *scene, Sequence *seq)
char *ext = NULL;
int i;
- BKE_scene_view_get_prefix(scene, name, prefix, &ext);
+ BKE_scene_view_prefix_get(scene, name, prefix, &ext);
if (prefix[0] == '\0')
goto monoview;
for (i = 0; i < totfiles; i++) {
- const char *viewname = BKE_scene_render_view_name(&scene->r, i);
- const char *suffix = BKE_scene_view_get_suffix(&scene->r, viewname);
+ const char *viewname = BKE_scene_render_view_name_get(&scene->r, i);
+ const char *suffix = BKE_scene_view_suffix_get(&scene->r, viewname);
char str[FILE_MAX] = {'\0'};
StripAnim *sanim = MEM_mallocN(sizeof(StripAnim), "Strip Anim");
@@ -2717,7 +2717,7 @@ static ImBuf *seq_render_scene_strip(const SeqRenderData *context, Sequence *seq
char err_out[256] = "unknown";
int width = (scene->r.xsch * scene->r.size) / 100;
int height = (scene->r.ysch * scene->r.size) / 100;
- const char *viewname = BKE_scene_render_view_name(&scene->r, context->view_id);
+ const char *viewname = BKE_scene_render_view_name_get(&scene->r, context->view_id);
/* for old scened this can be uninitialized,
* should probably be added to do_versions at some point if the functionality stays */
@@ -2750,7 +275
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list