[Bf-blender-cvs] [1b10900] multiview: cleanup & use STREQ macro
Campbell Barton
noreply at git.blender.org
Mon Nov 24 16:38:25 CET 2014
Commit: 1b1090081b3334e2499c46bed9e1a5d1eba0ce5f
Author: Campbell Barton
Date: Mon Nov 24 16:30:13 2014 +0100
Branches: multiview
https://developer.blender.org/rB1b1090081b3334e2499c46bed9e1a5d1eba0ce5f
cleanup & use STREQ macro
===================================================================
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_image.py
M release/scripts/startup/bl_ui/space_sequencer.py
M source/blender/blenkernel/intern/scene.c
M source/blender/blenkernel/intern/sequencer.c
M source/blender/makesrna/intern/rna_render.c
M source/blender/makesrna/intern/rna_scene.c
M source/blender/render/intern/source/render_result.c
===================================================================
diff --git a/intern/cycles/blender/addon/ui.py b/intern/cycles/blender/addon/ui.py
index 97acb6e..a5accfa 100644
--- a/intern/cycles/blender/addon/ui.py
+++ b/intern/cycles/blender/addon/ui.py
@@ -430,7 +430,7 @@ class CyclesRender_PT_views(CyclesButtonsPanel, Panel):
layout.active = rd.use_multiple_views
- basic_stereo = rd.views_setup == 'SETUP_BASIC'
+ basic_stereo = (rd.views_setup == 'SETUP_BASIC')
row = layout.row()
row.prop(rd, "views_setup", expand=True)
@@ -452,7 +452,7 @@ class CyclesRender_PT_views(CyclesButtonsPanel, Panel):
col.operator("scene.render_view_remove", icon='ZOOMOUT', text="")
row = layout.row()
- if rv and rv.name not in ('left', 'right'):
+ if rv and rv.name not in {"left", "right"}:
row.prop(rv, "name")
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 5b78681..d177e80 100644
--- a/release/scripts/startup/bl_ui/properties_data_camera.py
+++ b/release/scripts/startup/bl_ui/properties_data_camera.py
@@ -125,16 +125,14 @@ class DATA_PT_camera_stereoscopy(CameraButtonsPanel, Panel):
@classmethod
def poll(cls, context):
- scene = context.scene
-
- multiview = scene.render.use_multiple_views
- engine = scene.render.engine
-
- return context.camera and multiview and (engine in cls.COMPAT_ENGINES)
+ render = context.scene.render
+ return (super().poll(context) and render.use_multiple_views)
def draw(self, context):
layout = self.layout
- layout.active = context.scene.render.views_setup == 'STEREO_3D'
+ render = context.scene.render
+
+ layout.active = (render.views_setup == '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 213438f..6f970d0 100644
--- a/release/scripts/startup/bl_ui/properties_render_layer.py
+++ b/release/scripts/startup/bl_ui/properties_render_layer.py
@@ -168,13 +168,14 @@ class RENDERLAYER_UL_renderviews(UIList):
# assert(isinstance(item, bpy.types.SceneRenderView)
view = item
if self.layout_type in {'DEFAULT', 'COMPACT'}:
- if view.name in ('left', 'right', 'Left', 'Right'): #XXX MV remove left, right when I implement the ui names capitalized
+ # XXX MV remove left, right when I implement the ui names capitalized
+ if view.name in {'left', 'right', 'Left', 'Right'}:
layout.label(view.name, icon_value=icon + (not view.use))
else:
layout.prop(view, "name", text="", index=index, icon_value=icon, emboss=False)
layout.prop(view, "use", text="", index=index)
- elif self.layout_type in {'GRID'}:
+ elif self.layout_type == 'GRID':
layout.alignment = 'CENTER'
layout.label("", icon_value=icon + (not view.use))
diff --git a/release/scripts/startup/bl_ui/space_image.py b/release/scripts/startup/bl_ui/space_image.py
index 6c7046b..edfbc7d 100644
--- a/release/scripts/startup/bl_ui/space_image.py
+++ b/release/scripts/startup/bl_ui/space_image.py
@@ -682,9 +682,11 @@ class IMAGE_PT_stereo_3d_properties(Panel):
@classmethod
def poll(cls, context):
sima = context.space_data
- image = sima.image if sima else None
- return (sima and image and image.type == 'IMAGE' and \
- context.scene.render.use_multiple_views)
+ if sima:
+ image = sima.image
+ return (image and image.type == 'IMAGE' and
+ context.scene.render.use_multiple_views)
+ return False
def draw(self, context):
layout = self.layout
diff --git a/release/scripts/startup/bl_ui/space_sequencer.py b/release/scripts/startup/bl_ui/space_sequencer.py
index 19ab875..1c1f7ef 100644
--- a/release/scripts/startup/bl_ui/space_sequencer.py
+++ b/release/scripts/startup/bl_ui/space_sequencer.py
@@ -1025,7 +1025,7 @@ class SEQUENCER_PT_stereo_3d(SequencerButtonsPanel, Panel):
if not strip:
return False
- return (strip.type in {'IMAGE', 'MOVIE'} and \
+ return (strip.type in {'IMAGE', 'MOVIE'} and
context.scene.render.use_multiple_views)
def draw(self, context):
diff --git a/source/blender/blenkernel/intern/scene.c b/source/blender/blenkernel/intern/scene.c
index 52ff814..57727a1 100644
--- a/source/blender/blenkernel/intern/scene.c
+++ b/source/blender/blenkernel/intern/scene.c
@@ -2195,7 +2195,7 @@ bool BKE_scene_render_view_first(const RenderData *rd, const char *viewname)
for (srv = rd->views.first; srv; srv = srv->next) {
if (BKE_scene_render_view_active(rd, srv)) {
- return strcmp(viewname, srv->name) == 0;
+ return STREQ(viewname, srv->name);
}
}
@@ -2264,10 +2264,12 @@ size_t BKE_scene_view_get_id(const RenderData *rd, const char *viewname)
nr = 0;
for (srv = rd->views.first, nr = 0; srv; srv = srv->next) {
if (BKE_scene_render_view_active(rd, srv)) {
- if (strcmp(viewname, srv->name) == 0)
+ if (STREQ(viewname, srv->name)) {
return nr;
- else
+ }
+ else {
nr += 1;
+ }
}
}
diff --git a/source/blender/blenkernel/intern/sequencer.c b/source/blender/blenkernel/intern/sequencer.c
index 35566b2..f92aab0 100644
--- a/source/blender/blenkernel/intern/sequencer.c
+++ b/source/blender/blenkernel/intern/sequencer.c
@@ -2900,7 +2900,7 @@ static ImBuf *do_render_strip_uncached(const SeqRenderData *context, Sequence *s
for (i = 0; i < totfiles; i++) {
- if (prefix[0] == '\0'){
+ if (prefix[0] == '\0') {
ibufs[i] = IMB_loadiffname(name, flag, seq->strip->colorspace_settings.name);
}
else {
diff --git a/source/blender/makesrna/intern/rna_render.c b/source/blender/makesrna/intern/rna_render.c
index f5ed3dc..a2dfef1 100644
--- a/source/blender/makesrna/intern/rna_render.c
+++ b/source/blender/makesrna/intern/rna_render.c
@@ -752,7 +752,7 @@ static void rna_def_render_layer(BlenderRNA *brna)
NULL, NULL, NULL, NULL);
#if 0
- /* XXX MV store actvie in RL or pass as argument
+ /* XXX MV store active in RL or pass as argument
* Actually, as suggested by Brecht we should use string and not the int in the API
* (same as we do for renderlayer)
* */
diff --git a/source/blender/makesrna/intern/rna_scene.c b/source/blender/makesrna/intern/rna_scene.c
index 6a5a988..d3580e4 100644
--- a/source/blender/makesrna/intern/rna_scene.c
+++ b/source/blender/makesrna/intern/rna_scene.c
@@ -774,8 +774,8 @@ static int rna_RenderSettings_stereoViews_skip(CollectionPropertyIterator *iter,
ListBaseIterator *internal = &iter->internal.listbase;
SceneRenderView *srv = (SceneRenderView *)internal->link;
- if ((strcmp(srv->name, STEREO_LEFT_NAME ) == 0) ||
- (strcmp(srv->name, STEREO_RIGHT_NAME) == 0))
+ if ((STREQ(srv->name, STEREO_LEFT_NAME)) ||
+ (STREQ(srv->name, STEREO_RIGHT_NAME)))
{
return 0;
}
diff --git a/source/blender/render/intern/source/render_result.c b/source/blender/render/intern/source/render_result.c
index 83ca739..f16d243 100644
--- a/source/blender/render/intern/source/render_result.c
+++ b/source/blender/render/intern/source/render_result.c
@@ -627,7 +627,7 @@ RenderResult *render_result_new(Render *re, rcti *partrct, int crop, int savebuf
const char *view = rv->name;
if (viewname && viewname[0])
- if (strcmp(view, viewname) != 0)
+ if (!STREQ(view, viewname))
continue;
if (rr->do_exr_tile)
@@ -859,15 +859,15 @@ static int order_render_passes(const void *a, const void *b)
/* they have the same type */
/* left first */
- if (strcmp(rpa->view, STEREO_LEFT_NAME) == 0)
+ if (STREQ(rpa->view, STEREO_LEFT_NAME))
return 0;
- else if (strcmp(rpb->view, STEREO_LEFT_NAME) == 0)
+ else if (STREQ(rpb->view, STEREO_LEFT_NAME))
return 1;
/* right second */
- if (strcmp(rpa->view, STEREO_RIGHT_NAME) == 0)
+ if (STREQ(rpa->view, STEREO_RIGHT_NAME))
return 0;
- else if (strcmp(rpb->view, STEREO_RIGHT_NAME) == 0)
+ else if (STREQ(rpb->view, STEREO_RIGHT_NAME))
return 1;
/* remaining in ascending id order */
More information about the Bf-blender-cvs
mailing list