[Bf-blender-cvs] [fb2577a] multiview: From review: rename 'use_multiple_views' to 'use_multiview'
Dalai Felinto
noreply at git.blender.org
Wed Nov 26 19:45:05 CET 2014
Commit: fb2577ab31e3fdb0e04ec8ec96c458244ba9f053
Author: Dalai Felinto
Date: Wed Nov 26 10:06:40 2014 -0200
Branches: multiview
https://developer.blender.org/rBfb2577ab31e3fdb0e04ec8ec96c458244ba9f053
>From review: rename 'use_multiple_views' to 'use_multiview'
===================================================================
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.py
M release/scripts/startup/bl_ui/properties_render_layer.py
M release/scripts/startup/bl_ui/space_image.py
M release/scripts/startup/bl_ui/space_sequencer.py
M release/scripts/startup/bl_ui/space_view3d.py
M source/blender/editors/space_image/image_ops.c
M source/blender/editors/space_sequencer/sequencer_add.c
M source/blender/makesrna/intern/rna_scene.c
M source/blender/windowmanager/intern/wm_operators.c
===================================================================
diff --git a/intern/cycles/blender/addon/ui.py b/intern/cycles/blender/addon/ui.py
index a5accfa..89317dd 100644
--- a/intern/cycles/blender/addon/ui.py
+++ b/intern/cycles/blender/addon/ui.py
@@ -419,7 +419,7 @@ class CyclesRender_PT_views(CyclesButtonsPanel, Panel):
def draw_header(self, context):
rd = context.scene.render
- self.layout.prop(rd, "use_multiple_views", text="")
+ self.layout.prop(rd, "use_multiview", text="")
def draw(self, context):
layout = self.layout
@@ -429,7 +429,7 @@ class CyclesRender_PT_views(CyclesButtonsPanel, Panel):
rv = rd.views.active
- layout.active = rd.use_multiple_views
+ layout.active = rd.use_multiview
basic_stereo = (rd.views_setup == 'SETUP_BASIC')
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 d177e80..cd79095 100644
--- a/release/scripts/startup/bl_ui/properties_data_camera.py
+++ b/release/scripts/startup/bl_ui/properties_data_camera.py
@@ -126,7 +126,7 @@ class DATA_PT_camera_stereoscopy(CameraButtonsPanel, Panel):
@classmethod
def poll(cls, context):
render = context.scene.render
- return (super().poll(context) and render.use_multiple_views)
+ return (super().poll(context) and render.use_multiview)
def draw(self, context):
layout = self.layout
diff --git a/release/scripts/startup/bl_ui/properties_render.py b/release/scripts/startup/bl_ui/properties_render.py
index 39f7c7a..e89477f 100644
--- a/release/scripts/startup/bl_ui/properties_render.py
+++ b/release/scripts/startup/bl_ui/properties_render.py
@@ -404,7 +404,7 @@ class RENDER_PT_output(RenderButtonsPanel, Panel):
col.prop(rd, "use_render_cache")
layout.template_image_settings(image_settings, color_management=False)
- if rd.use_multiple_views:
+ if rd.use_multiview:
layout.template_image_views(image_settings)
if file_format == 'QUICKTIME':
diff --git a/release/scripts/startup/bl_ui/properties_render_layer.py b/release/scripts/startup/bl_ui/properties_render_layer.py
index 6f970d0..eb990ae 100644
--- a/release/scripts/startup/bl_ui/properties_render_layer.py
+++ b/release/scripts/startup/bl_ui/properties_render_layer.py
@@ -186,7 +186,7 @@ class RENDERLAYER_PT_views(RenderLayerButtonsPanel, Panel):
def draw_header(self, context):
rd = context.scene.render
- self.layout.prop(rd, "use_multiple_views", text="")
+ self.layout.prop(rd, "use_multiview", text="")
def draw(self, context):
layout = self.layout
@@ -195,7 +195,7 @@ class RENDERLAYER_PT_views(RenderLayerButtonsPanel, Panel):
rd = scene.render
rv = rd.views.active
- layout.active = rd.use_multiple_views
+ layout.active = rd.use_multiview
basic_stereo = rd.views_setup == 'STEREO_3D'
row = layout.row()
diff --git a/release/scripts/startup/bl_ui/space_image.py b/release/scripts/startup/bl_ui/space_image.py
index edfbc7d..0adf362 100644
--- a/release/scripts/startup/bl_ui/space_image.py
+++ b/release/scripts/startup/bl_ui/space_image.py
@@ -685,7 +685,7 @@ class IMAGE_PT_stereo_3d_properties(Panel):
if sima:
image = sima.image
return (image and image.type == 'IMAGE' and
- context.scene.render.use_multiple_views)
+ context.scene.render.use_multiview)
return False
def draw(self, context):
diff --git a/release/scripts/startup/bl_ui/space_sequencer.py b/release/scripts/startup/bl_ui/space_sequencer.py
index e879513..cbb285d 100644
--- a/release/scripts/startup/bl_ui/space_sequencer.py
+++ b/release/scripts/startup/bl_ui/space_sequencer.py
@@ -1031,7 +1031,7 @@ class SEQUENCER_PT_stereo_3d(SequencerButtonsPanel, Panel):
return False
return (strip.type in {'IMAGE', 'MOVIE'} and
- context.scene.render.use_multiple_views)
+ context.scene.render.use_multiview)
def draw(self, context):
layout = self.layout
diff --git a/release/scripts/startup/bl_ui/space_view3d.py b/release/scripts/startup/bl_ui/space_view3d.py
index 3e59e50..1256941 100644
--- a/release/scripts/startup/bl_ui/space_view3d.py
+++ b/release/scripts/startup/bl_ui/space_view3d.py
@@ -2866,7 +2866,7 @@ class VIEW3D_PT_view3d_stereo(Panel):
def poll(cls, context):
scene = context.scene
- multiview = scene.render.use_multiple_views
+ multiview = scene.render.use_multiview
return context.space_data and multiview
def draw(self, context):
diff --git a/source/blender/editors/space_image/image_ops.c b/source/blender/editors/space_image/image_ops.c
index 2eec5a5..17ee861 100644
--- a/source/blender/editors/space_image/image_ops.c
+++ b/source/blender/editors/space_image/image_ops.c
@@ -1093,7 +1093,7 @@ static int image_open_exec(bContext *C, wmOperator *op)
image_open_init(C, op);
/* handle multiview images */
- if (RNA_boolean_get(op->ptr, "use_multiple_views")) {
+ if (RNA_boolean_get(op->ptr, "use_multiview")) {
ImageFormatData *imf = &iod->im_format;
ima->views_format = imf->views_format;
@@ -1212,7 +1212,7 @@ static int image_open_invoke(bContext *C, wmOperator *op, const wmEvent *UNUSED(
image_open_init(C, op);
/* show multiview save options only if scene has multiviews */
- prop = RNA_struct_find_property(op->ptr, "use_multiple_views");
+ prop = RNA_struct_find_property(op->ptr, "use_multiview");
RNA_property_boolean_set(op->ptr, prop, (scene->r.scemode & R_MULTIVIEW) != 0);
image_filesel(C, op, path);
@@ -1236,7 +1236,7 @@ static void image_open_draw(bContext *UNUSED(C), wmOperator *op)
ImageOpenData *iod = op->customdata;
ImageFormatData *imf = &iod->im_format;
PointerRNA imf_ptr, ptr;
- const bool is_multiview = RNA_boolean_get(op->ptr, "use_multiple_views");
+ const bool is_multiview = RNA_boolean_get(op->ptr, "use_multiview");
/* main draw call */
RNA_pointer_create(NULL, op->type->srna, op->properties, &ptr);
@@ -1941,7 +1941,7 @@ static int image_save_as_invoke(bContext *C, wmOperator *op, const wmEvent *UNUS
memcpy(op->customdata, &simopts.im_format, sizeof(simopts.im_format));
/* show multiview save options only if image has multiviews */
- prop = RNA_struct_find_property(op->ptr, "use_multiple_views");
+ prop = RNA_struct_find_property(op->ptr, "use_multiview");
RNA_property_boolean_set(op->ptr, prop, (ima->flag & IMA_IS_STEREO));
image_filesel(C, op, simopts.filepath);
@@ -1971,7 +1971,7 @@ static void image_save_as_draw(bContext *UNUSED(C), wmOperator *op)
uiLayout *layout = op->layout;
ImageFormatData *imf = op->customdata;
PointerRNA imf_ptr, ptr;
- const bool is_multiview = RNA_boolean_get(op->ptr, "use_multiple_views");
+ const bool is_multiview = RNA_boolean_get(op->ptr, "use_multiview");
/* image template */
RNA_pointer_create(NULL, &RNA_ImageFormatSettings, imf, &imf_ptr);
diff --git a/source/blender/editors/space_sequencer/sequencer_add.c b/source/blender/editors/space_sequencer/sequencer_add.c
index e0e59f8..45fbb2a 100644
--- a/source/blender/editors/space_sequencer/sequencer_add.c
+++ b/source/blender/editors/space_sequencer/sequencer_add.c
@@ -230,7 +230,7 @@ static void seq_load_operator_info(SeqLoadInfo *seq_load, wmOperator *op)
RNA_PROP_END;
}
- if ((prop = RNA_struct_find_property(op->ptr, "use_multiple_views")) && RNA_property_boolean_get(op->ptr, prop)) {
+ if ((prop = RNA_struct_find_property(op->ptr, "use_multiview")) && RNA_property_boolean_get(op->ptr, prop)) {
if (op->customdata) {
SequencerAddData *sad = op->customdata;
ImageFormatData *imf = &sad->im_format;
@@ -650,7 +650,7 @@ static int sequencer_add_movie_strip_invoke(bContext *C, wmOperator *op, const w
sequencer_add_init(C, op);
/* show multiview save options only if scene has multiviews */
- prop = RNA_struct_find_property(op->ptr, "use_multiple_views");
+ prop = RNA_struct_find_property(op->ptr, "use_multiview");
RNA_property_boolean_set(op->ptr, prop, (scene->r.scemode & R_MULTIVIEW) != 0);
WM_event_add_fileselect(C, op);
@@ -665,7 +665,7 @@ static void sequencer_add_draw(bContext *UNUSED(C), wmOperator *op)
SequencerAddData *sad = op->customdata;
ImageFormatData *imf = &sad->im_format;
PointerRNA imf_ptr, ptr;
- const bool is_multiview = RNA_boolean_get(op->ptr, "use_multiple_views");
+ const bool is_multiview = RNA_boolean_get(op->ptr, "use_multiview");
/* main draw call */
RNA_pointer_create(NULL, op->type->srna, op->properties, &ptr);
@@ -833,7 +833,7 @@ static int sequencer_add_image_strip_invoke(bContext *C, wmOperator *op, const w
sequencer_add_init(C, op);
/* show multiview save options only if scene has multiviews */
- prop = RNA_struct_find_property(op->ptr, "use_multiple_views");
+ prop = RNA_struct_find_property(op->ptr, "use_multiview");
RNA_property_boolean_set(op->ptr, prop, (scene->r.scemode & R_MULTIVIEW) != 0);
WM_event_add_fileselect(C, op);
diff --git a/source/blender/makesrna/intern/rna_scene.c b/source/blender/makesrna/intern/rna_scene.c
index d3580e4..a637495 100644
--- a/source/blender/makesrna/intern/rna_scene.c
+++ b/source/blender/makesrna/intern/rna_scene.c
@@ -5468,7 +5468,7 @@ static void rna_def_scene_render_data(BlenderRNA *brna)
RNA_def_property_struct_type(prop, "SceneRenderView");
RNA_def_property_ui_text(prop, "Render Views", "");
- prop = RNA_def_property(srna, "use_multiple_views", PROP_BOOLEAN, PROP_NONE);
+ prop = RNA_def_property(srna, "use_multiview", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, NULL, "scemode", R_MULTIVIEW);
RNA_def_property_ui_text(prop, "Multiple Views", "Use multiple views in the scene");
RNA_def_property_update(prop, NC_SCENE | ND_RENDER_OPTIONS, NULL);
diff --git a/source/blender/windowmanager/intern/wm_operators.c b/source/blender/windowmanager/intern/wm_operators.c
index 49ae9a4..e90c0a3 100644
--- a/source/blender/windowmanager/intern/wm_operators.c
+++ b/source/blender/windowmanager/intern/wm_operators.c
@@ -1257,7 +1257,7 @@ void WM_opera
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list