[Bf-blender-cvs] [289c8d6] multiview: From review: rename views_setup by views_format
Dalai Felinto
noreply at git.blender.org
Wed Nov 26 19:45:07 CET 2014
Commit: 289c8d6c6ce97f4f8b02384e36bc61d117c90a3e
Author: Dalai Felinto
Date: Wed Nov 26 10:19:33 2014 -0200
Branches: multiview
https://developer.blender.org/rB289c8d6c6ce97f4f8b02384e36bc61d117c90a3e
>From review: rename views_setup by views_format
===================================================================
M intern/cycles/blender/addon/ui.py
M release/scripts/startup/bl_ui/properties_data_camera.py
M release/scripts/startup/bl_ui/properties_render_layer.py
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/blenkernel/intern/seqcache.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
M source/blender/makesrna/intern/rna_space.c
===================================================================
diff --git a/intern/cycles/blender/addon/ui.py b/intern/cycles/blender/addon/ui.py
index 89317dd..c3c7b09 100644
--- a/intern/cycles/blender/addon/ui.py
+++ b/intern/cycles/blender/addon/ui.py
@@ -430,10 +430,10 @@ class CyclesRender_PT_views(CyclesButtonsPanel, Panel):
layout.active = rd.use_multiview
- basic_stereo = (rd.views_setup == 'SETUP_BASIC')
+ basic_stereo = (rd.views_format == 'SETUP_BASIC')
row = layout.row()
- row.prop(rd, "views_setup", expand=True)
+ row.prop(rd, "views_format", expand=True)
if basic_stereo:
row = layout.row()
diff --git a/release/scripts/startup/bl_ui/properties_data_camera.py b/release/scripts/startup/bl_ui/properties_data_camera.py
index cd79095..5b46794 100644
--- a/release/scripts/startup/bl_ui/properties_data_camera.py
+++ b/release/scripts/startup/bl_ui/properties_data_camera.py
@@ -132,7 +132,7 @@ class DATA_PT_camera_stereoscopy(CameraButtonsPanel, Panel):
layout = self.layout
render = context.scene.render
- layout.active = (render.views_setup == 'STEREO_3D')
+ layout.active = (render.views_format == 'STEREO_3D')
col = layout.column()
diff --git a/release/scripts/startup/bl_ui/properties_render_layer.py b/release/scripts/startup/bl_ui/properties_render_layer.py
index eb990ae..c17d84d 100644
--- a/release/scripts/startup/bl_ui/properties_render_layer.py
+++ b/release/scripts/startup/bl_ui/properties_render_layer.py
@@ -196,10 +196,10 @@ class RENDERLAYER_PT_views(RenderLayerButtonsPanel, Panel):
rv = rd.views.active
layout.active = rd.use_multiview
- basic_stereo = rd.views_setup == 'STEREO_3D'
+ basic_stereo = rd.views_format == 'STEREO_3D'
row = layout.row()
- row.prop(rd, "views_setup", expand=True)
+ row.prop(rd, "views_format", expand=True)
if basic_stereo:
row = layout.row()
diff --git a/release/scripts/startup/bl_ui/space_view3d.py b/release/scripts/startup/bl_ui/space_view3d.py
index 1256941..6380409 100644
--- a/release/scripts/startup/bl_ui/space_view3d.py
+++ b/release/scripts/startup/bl_ui/space_view3d.py
@@ -2873,7 +2873,7 @@ class VIEW3D_PT_view3d_stereo(Panel):
layout = self.layout
view = context.space_data
- basic_stereo = context.scene.render.views_setup == 'STEREO_3D'
+ basic_stereo = context.scene.render.views_format == '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 497e078..9245a11 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_MULTIVIEW) {
+ else if (rd->views_format == SCE_VIEWS_FORMAT_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_STEREO_3D) {
+ else if (scene->r.views_format == SCE_VIEWS_FORMAT_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_MULTIVIEW) {
+ else if (rd->views_format == SCE_VIEWS_FORMAT_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 fe322fa..cffc806 100644
--- a/source/blender/blenkernel/intern/scene.c
+++ b/source/blender/blenkernel/intern/scene.c
@@ -2128,7 +2128,7 @@ size_t BKE_scene_num_views_get(const RenderData *rd)
if ((rd->scemode & R_MULTIVIEW) == 0)
return 1;
- if (rd->views_setup == SCE_VIEWS_SETUP_STEREO_3D) {
+ if (rd->views_format == SCE_VIEWS_FORMAT_STEREO_3D) {
if (BLI_findstring(&rd->views, STEREO_LEFT_NAME, offsetof(SceneRenderView, name)))
totviews++;
@@ -2169,7 +2169,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_MULTIVIEW)
+ if (rd->views_format == SCE_VIEWS_FORMAT_MULTIVIEW)
return true;
/* SCE_VIEWS_SETUP_BASIC */
diff --git a/source/blender/blenkernel/intern/seqcache.c b/source/blender/blenkernel/intern/seqcache.c
index 3974eda..ca870eb 100644
--- a/source/blender/blenkernel/intern/seqcache.c
+++ b/source/blender/blenkernel/intern/seqcache.c
@@ -80,7 +80,7 @@ static bool seq_cmp_render_data(const SeqRenderData *a, const SeqRenderData *b)
(a->scene != b->scene) ||
(a->motion_blur_shutter != b->motion_blur_shutter) ||
(a->motion_blur_samples != b->motion_blur_samples) ||
- (a->scene->r.views_setup != b->scene->r.views_setup) ||
+ (a->scene->r.views_format != b->scene->r.views_format) ||
(a->view_id != b->view_id));
}
@@ -93,7 +93,7 @@ static unsigned int seq_hash_render_data(const SeqRenderData *a)
rval ^= ((intptr_t) a->scene) << 6;
rval ^= (int)(a->motion_blur_shutter * 100.0f) << 10;
rval ^= a->motion_blur_samples << 24;
- rval ^= ((a->scene->r.views_setup * 2) + a->view_id) << 32;
+ rval ^= ((a->scene->r.views_format * 2) + a->view_id) << 32;
return rval;
}
diff --git a/source/blender/editors/space_view3d/drawobject.c b/source/blender/editors/space_view3d/drawobject.c
index e91928c..827b3ae 100644
--- a/source/blender/editors/space_view3d/drawobject.c
+++ b/source/blender/editors/space_view3d/drawobject.c
@@ -1817,8 +1817,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_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_cameras = (v3d->stereo3d_flag & V3D_S3D_DISPCAMERAS) && (scene->r.views_format == SCE_VIEWS_FORMAT_STEREO_3D);
+ const bool is_stereo3d_plane = (v3d->stereo3d_flag & V3D_S3D_DISPPLANE) && (scene->r.views_format == SCE_VIEWS_FORMAT_STEREO_3D);
const bool is_stereo3d_volume = (v3d->stereo3d_flag & V3D_S3D_DISPVOLUME);
zero_v3(tvec);
@@ -1989,7 +1989,7 @@ static void drawcamera(Scene *scene, View3D *v3d, RegionView3D *rv3d, Base *base
const bool is_stereo3d = drawcamera_is_stereo3d(scene, v3d, ob);
const bool is_stereo3d_cameras = (ob == scene->camera) &&
(scene->r.scemode & R_MULTIVIEW) &&
- (scene->r.views_setup == SCE_VIEWS_SETUP_STEREO_3D) &&
+ (scene->r.views_format == SCE_VIEWS_FORMAT_STEREO_3D) &&
(v3d->stereo3d_flag & V3D_S3D_DISPCAMERAS);
/* draw data for movie clip set as active for scene */
diff --git a/source/blender/editors/space_view3d/view3d_draw.c b/source/blender/editors/space_view3d/view3d_draw.c
index d7fa680..d636656 100644
--- a/source/blender/editors/space_view3d/view3d_draw.c
+++ b/source/blender/editors/space_view3d/view3d_draw.c
@@ -3419,7 +3419,7 @@ static bool view3d_stereo3d_active(const bContext *C, Scene *scene, View3D *v3d,
if ((v3d->camera == NULL) || rv3d->persp != RV3D_CAMOB)
return false;
- if (scene->r.views_setup & SCE_VIEWS_SETUP_MULTIVIEW) {
+ if (scene->r.views_format & SCE_VIEWS_FORMAT_MULTIVIEW) {
if (v3d->stereo3d_camera == STEREO_MONO_ID)
return false;
@@ -3451,7 +3451,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_STEREO_3D) {
+ if (scene->r.views_format == SCE_VIEWS_FORMAT_STEREO_3D) {
Camera *data;
float viewmat[4][4];
float shiftx;
@@ -3468,7 +3468,7 @@ static void view3d_stereo3d_setup(Scene *scene, View3D *v3d, ARegion *ar)
data->shiftx = shiftx;
BLI_unlock_thread(LOCK_VIEW3D);
}
- else { /* SCE_VIEWS_SETUP_MULTIVIEW */
+ else { /* SCE_VIEWS_FORMAT_MULTIVIEW */
float viewmat[4][4];
Object *view_ob = v3d->camera;
Object *camera = BKE_camera_render(scene, v3d->camera, viewname);
@@ -3488,14 +3488,14 @@ 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_STEREO_3D) {
+ if (scene->r.views_format == SCE_VIEWS_FORMAT_STEREO_3D) {
float viewmat[4][4];
const bool is_left = STREQ(viewname, STEREO_LEFT_NAME);
BKE_camera_view_matrix(&scene->r, v3d->camera, is_left, viewmat);
view3d_main_area_setup_view(scene, v3d, ar, viewmat, winmat);
}
- else { /* SCE_VIEWS_SETUP_MULTIVIEW */
+ else { /* SCE_VIEWS_FORMAT_MULTIVIEW */
float viewmat[4][4];
Object *camera = BKE_camera_render(scene, v3d->camera, viewname);
diff --git a/source/blender/makesdna/DNA_scene_types.h b/source/blender/makesdna/DNA_scene_types.h
index f57e24c..670a266 100644
--- a/source/blender/makesdna/DNA_scene_types.h
+++ b/source/blender/makesdna/DNA_scene_types.h
@@ -264,10 +264,10 @@ typedef struct SceneRenderView {
/* srv->viewflag */
#define SCE_VIEW_DISABLE (1<<0)
-/* scene.render.views_setup */
+/* scene.render.views_format */
enum {
- SCE_VIEWS_SETUP_STEREO_3D = 0,
- SCE_VIEWS_SETUP_MULTIVIEW = 1,
+ SCE_VIEWS_FORMAT_STEREO_3D = 0,
+ SCE_VIEWS_FORMAT_MULTIVIEW = 1,
};
/* ImageFormatData.views_output */
@@ -687,7 +687,7 @@
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list