[Bf-blender-cvs] [482eac6] multiview: Rename 'Basic Stereo'/'Advanced Stereo' to 'Stereo 3D'/'Multi-View'
Dalai Felinto
noreply at git.blender.org
Tue Sep 23 12:41:58 CEST 2014
Commit: 482eac61a28bfefe54bdcb9ade97845150dd3a42
Author: Dalai Felinto
Date: Tue Sep 23 12:41:32 2014 +0200
Branches: multiview
https://developer.blender.org/rB482eac61a28bfefe54bdcb9ade97845150dd3a42
Rename 'Basic Stereo'/'Advanced Stereo' to 'Stereo 3D'/'Multi-View'
===================================================================
M release/scripts/startup/bl_ui/space_view3d.py
M source/blender/blenkernel/intern/camera.c
M source/blender/blenkernel/intern/scene.c
M source/blender/editors/space_view3d/drawobject.c
M source/blender/editors/space_view3d/view3d_draw.c
M source/blender/makesdna/DNA_scene_types.h
M source/blender/makesrna/intern/rna_scene.c
===================================================================
diff --git a/release/scripts/startup/bl_ui/space_view3d.py b/release/scripts/startup/bl_ui/space_view3d.py
index e1c78c7..b3feaff 100644
--- a/release/scripts/startup/bl_ui/space_view3d.py
+++ b/release/scripts/startup/bl_ui/space_view3d.py
@@ -2850,7 +2850,7 @@ class VIEW3D_PT_view3d_stereo(Panel):
layout = self.layout
view = context.space_data
- basic_stereo = context.scene.render.views_setup == 'SETUP_BASIC'
+ basic_stereo = context.scene.render.views_setup == 'STEREO_3D'
col = layout.column()
col.row().prop(view, "stereo_3d_camera", expand=True)
diff --git a/source/blender/blenkernel/intern/camera.c b/source/blender/blenkernel/intern/camera.c
index b2001b4..9a3bb7b 100644
--- a/source/blender/blenkernel/intern/camera.c
+++ b/source/blender/blenkernel/intern/camera.c
@@ -729,7 +729,7 @@ void BKE_camera_model_matrix(RenderData *rd, Object *camera, const char *viewnam
if (!is_multiview) {
return camera_model_matrix(camera, r_modelmat);
}
- else if (rd->views_setup == SCE_VIEWS_SETUP_ADVANCED) {
+ else if (rd->views_setup == SCE_VIEWS_SETUP_MULTIVIEW) {
return camera_model_matrix(camera, r_modelmat);
}
else { /* SCE_VIEWS_SETUP_BASIC */
@@ -777,7 +777,7 @@ Object *BKE_camera_render(Scene *scene, Object *camera, const char *viewname)
if (!is_multiview) {
return camera;
}
- else if (scene->r.views_setup == SCE_VIEWS_SETUP_BASIC) {
+ else if (scene->r.views_setup == SCE_VIEWS_SETUP_STEREO_3D) {
return camera;
}
else { /* SCE_VIEWS_SETUP_ADVANCED */
@@ -833,7 +833,7 @@ float BKE_camera_shift_x(RenderData *rd, Object *camera, const char *viewname)
if (!is_multiview) {
return data->shiftx;
}
- else if (rd->views_setup == SCE_VIEWS_SETUP_ADVANCED) {
+ else if (rd->views_setup == SCE_VIEWS_SETUP_MULTIVIEW) {
return data->shiftx;
}
else { /* SCE_VIEWS_SETUP_BASIC */
diff --git a/source/blender/blenkernel/intern/scene.c b/source/blender/blenkernel/intern/scene.c
index 7d3a215..04d2875 100644
--- a/source/blender/blenkernel/intern/scene.c
+++ b/source/blender/blenkernel/intern/scene.c
@@ -2078,7 +2078,7 @@ size_t BKE_scene_num_views(const RenderData *rd)
if ((rd->scemode & R_MULTIVIEW) == 0)
return 1;
- if (rd->views_setup == SCE_VIEWS_SETUP_BASIC) {
+ if (rd->views_setup == SCE_VIEWS_SETUP_STEREO_3D) {
if (BLI_findstring(&rd->views, STEREO_LEFT_NAME, offsetof(SceneRenderView, name)))
totviews++;
@@ -2119,7 +2119,7 @@ bool BKE_scene_render_view_active(const RenderData *rd, const SceneRenderView *s
if ((srv->viewflag & SCE_VIEW_DISABLE))
return false;
- if (rd->views_setup == SCE_VIEWS_SETUP_ADVANCED)
+ if (rd->views_setup == SCE_VIEWS_SETUP_MULTIVIEW)
return true;
/* SCE_VIEWS_SETUP_BASIC */
diff --git a/source/blender/editors/space_view3d/drawobject.c b/source/blender/editors/space_view3d/drawobject.c
index 23a2ea4..195c839 100644
--- a/source/blender/editors/space_view3d/drawobject.c
+++ b/source/blender/editors/space_view3d/drawobject.c
@@ -1816,8 +1816,8 @@ static void drawcamera_stereo3d(Scene *scene, View3D *v3d, RegionView3D *rv3d, O
Camera *cams[2] = {cam};
const char *names[2] = {STEREO_LEFT_NAME, STEREO_RIGHT_NAME};
- const bool is_stereo3d_cameras = (v3d->stereo3d_flag & V3D_S3D_DISPCAMERAS) && (scene->r.views_setup == SCE_VIEWS_SETUP_BASIC);
- const bool is_stereo3d_plane = (v3d->stereo3d_flag & V3D_S3D_DISPPLANE) && (scene->r.views_setup == SCE_VIEWS_SETUP_BASIC);
+ const bool is_stereo3d_cameras = (v3d->stereo3d_flag & V3D_S3D_DISPCAMERAS) && (scene->r.views_setup == SCE_VIEWS_SETUP_STEREO_3D);
+ const bool is_stereo3d_plane = (v3d->stereo3d_flag & V3D_S3D_DISPPLANE) && (scene->r.views_setup == SCE_VIEWS_SETUP_STEREO_3D);
const bool is_stereo3d_volume = (v3d->stereo3d_flag & V3D_S3D_DISPVOLUME);
zero_v3(tvec);
@@ -1986,7 +1986,7 @@ static void drawcamera(Scene *scene, View3D *v3d, RegionView3D *rv3d, Base *base
MovieClip *clip = BKE_object_movieclip_get(scene, base->object, false);
const bool is_stereo3d = drawcamera_is_stereo3d(scene, v3d, ob);
- const bool is_stereo3d_cameras = (v3d->stereo3d_flag & V3D_S3D_DISPCAMERAS) && (scene->r.views_setup == SCE_VIEWS_SETUP_BASIC);
+ const bool is_stereo3d_cameras = (v3d->stereo3d_flag & V3D_S3D_DISPCAMERAS) && (scene->r.views_setup == SCE_VIEWS_SETUP_STEREO_3D);
/* draw data for movie clip set as active for scene */
if (clip) {
diff --git a/source/blender/editors/space_view3d/view3d_draw.c b/source/blender/editors/space_view3d/view3d_draw.c
index da77a3e..53c6171 100644
--- a/source/blender/editors/space_view3d/view3d_draw.c
+++ b/source/blender/editors/space_view3d/view3d_draw.c
@@ -3436,7 +3436,7 @@ static void view3d_stereo3d_setup(Scene *scene, View3D *v3d, ARegion *ar)
viewname = names[is_left ? STEREO_LEFT_ID : STEREO_RIGHT_ID];
/* update the viewport matrices with the new camera */
- if (scene->r.views_setup == SCE_VIEWS_SETUP_BASIC) {
+ if (scene->r.views_setup == SCE_VIEWS_SETUP_STEREO_3D) {
Camera *data;
float viewmat[4][4];
float shiftx;
@@ -3473,7 +3473,7 @@ static void view3d_stereo3d_setup_offscreen(Scene *scene, View3D *v3d, ARegion *
float winmat[4][4], const char *viewname)
{
/* update the viewport matrices with the new camera */
- if (scene->r.views_setup == SCE_VIEWS_SETUP_BASIC) {
+ if (scene->r.views_setup == SCE_VIEWS_SETUP_STEREO_3D) {
float viewmat[4][4];
const bool is_left = STREQ(viewname, STEREO_LEFT_NAME);
diff --git a/source/blender/makesdna/DNA_scene_types.h b/source/blender/makesdna/DNA_scene_types.h
index c208bf8..eab77d3 100644
--- a/source/blender/makesdna/DNA_scene_types.h
+++ b/source/blender/makesdna/DNA_scene_types.h
@@ -265,8 +265,8 @@ typedef struct SceneRenderView {
/* scene.render.views_setup */
enum {
- SCE_VIEWS_SETUP_BASIC = 0,
- SCE_VIEWS_SETUP_ADVANCED = 1
+ SCE_VIEWS_SETUP_STEREO_3D = 0,
+ SCE_VIEWS_SETUP_MULTIVIEW = 1,
};
/* ImageFormatData.views_output */
diff --git a/source/blender/makesrna/intern/rna_scene.c b/source/blender/makesrna/intern/rna_scene.c
index 7df1f16..3082c8a 100644
--- a/source/blender/makesrna/intern/rna_scene.c
+++ b/source/blender/makesrna/intern/rna_scene.c
@@ -332,7 +332,7 @@ EnumPropertyItem bake_save_mode_items[] = {
#define R_IMF_VIEWS_ENUM_IND {R_IMF_VIEWS_INDIVIDUAL, "INDIVIDUAL", 0, "Individual", "Individual files for each view with the prefix as defined by the scene views"},
#define R_IMF_VIEWS_ENUM_S3D {R_IMF_VIEWS_STEREO_3D, "STEREO_3D", 0, "Stereo 3D", "Single file with an encoded stereo pair"},
-#define R_IMF_VIEWS_ENUM_MV {R_IMF_VIEWS_MULTIVIEW, "MULTIVIEW", 0, "Multi View", "Single file with all the views"},
+#define R_IMF_VIEWS_ENUM_MV {R_IMF_VIEWS_MULTIVIEW, "MULTIVIEW", 0, "Multi-View", "Single file with all the views"},
EnumPropertyItem views_format_items[] = {
R_IMF_VIEWS_ENUM_IND
@@ -1389,8 +1389,8 @@ static void rna_RenderSettings_views_setup_set(PointerRNA *ptr, int value)
{
RenderData *rd = (RenderData *)ptr->data;
- if (rd->views_setup == SCE_VIEWS_SETUP_ADVANCED &&
- value == SCE_VIEWS_SETUP_BASIC)
+ if (rd->views_setup == SCE_VIEWS_SETUP_MULTIVIEW &&
+ value == SCE_VIEWS_SETUP_STEREO_3D)
{
/* make sure the actview is visible */
if (rd->actview > 1) rd->actview = 1;
@@ -4748,9 +4748,9 @@ static void rna_def_scene_render_data(BlenderRNA *brna)
{0, NULL, 0, NULL, NULL}};
static EnumPropertyItem views_setup_items[] = {
- {SCE_VIEWS_SETUP_BASIC, "SETUP_BASIC", 0, "Basic Stereo",
+ {SCE_VIEWS_SETUP_STEREO_3D, "STEREO_3D", 0, "Stereo 3D",
"Single stereo camera system, adjust the stereo settings in the camera panel"},
- {SCE_VIEWS_SETUP_ADVANCED, "SETUP_ADVANCED", 0, "Advanced Stereo",
+ {SCE_VIEWS_SETUP_MULTIVIEW, "MULTIVIEW", 0, "Multi-View",
"Multi camera system, adjust the cameras individually"},
{0, NULL, 0, NULL, NULL}
};
More information about the Bf-blender-cvs
mailing list