[Bf-blender-cvs] [22995bf] multiview: correct bool/flag use
Campbell Barton
noreply at git.blender.org
Mon Nov 24 10:27:27 CET 2014
Commit: 22995bf9dcbb04dfd0d122565c929898de74d5e9
Author: Campbell Barton
Date: Mon Nov 24 10:27:35 2014 +0100
Branches: multiview
https://developer.blender.org/rB22995bf9dcbb04dfd0d122565c929898de74d5e9
correct bool/flag use
===================================================================
M source/blender/blenkernel/intern/camera.c
M source/blender/compositor/nodes/COM_OutputFileNode.cpp
M source/blender/editors/space_image/image_ops.c
M source/blender/editors/space_node/drawnode.c
M source/blender/editors/space_sequencer/sequencer_add.c
M source/blender/windowmanager/intern/wm_stereo.c
===================================================================
diff --git a/source/blender/blenkernel/intern/camera.c b/source/blender/blenkernel/intern/camera.c
index 0549133..e5ee54a 100644
--- a/source/blender/blenkernel/intern/camera.c
+++ b/source/blender/blenkernel/intern/camera.c
@@ -724,7 +724,7 @@ static bool camera_is_left(const char *viewname)
void BKE_camera_model_matrix(RenderData *rd, Object *camera, const char *viewname, float r_modelmat[4][4])
{
- const bool is_multiview = (rd && rd->scemode & R_MULTIVIEW);
+ const bool is_multiview = (rd && rd->scemode & R_MULTIVIEW) != 0;
if (!is_multiview) {
return camera_model_matrix(camera, r_modelmat);
@@ -772,7 +772,7 @@ static Object *camera_multiview_advanced(Scene *scene, Object *camera, const cha
/* returns the camera to be used for render */
Object *BKE_camera_render(Scene *scene, Object *camera, const char *viewname)
{
- const bool is_multiview = (scene->r.scemode & R_MULTIVIEW);
+ const bool is_multiview = (scene->r.scemode & R_MULTIVIEW) != 0;
if (!is_multiview) {
return camera;
@@ -827,7 +827,7 @@ static float camera_stereo3d_shift_x(Object *camera, const char *viewname)
float BKE_camera_shift_x(RenderData *rd, Object *camera, const char *viewname)
{
- const bool is_multiview = (rd && rd->scemode & R_MULTIVIEW);
+ const bool is_multiview = (rd && rd->scemode & R_MULTIVIEW) != 0;
Camera *data = camera->data;
if (!is_multiview) {
diff --git a/source/blender/compositor/nodes/COM_OutputFileNode.cpp b/source/blender/compositor/nodes/COM_OutputFileNode.cpp
index eb574b0..acd2602 100644
--- a/source/blender/compositor/nodes/COM_OutputFileNode.cpp
+++ b/source/blender/compositor/nodes/COM_OutputFileNode.cpp
@@ -38,7 +38,7 @@ OutputFileNode::OutputFileNode(bNode *editorNode) : Node(editorNode)
void OutputFileNode::convertToOperations(NodeConverter &converter, const CompositorContext &context) const
{
NodeImageMultiFile *storage = (NodeImageMultiFile *)this->getbNode()->storage;
- const bool is_multiview = (context.getRenderData()->scemode & R_MULTIVIEW);
+ const bool is_multiview = (context.getRenderData()->scemode & R_MULTIVIEW) != 0;
if (!context.isRendering()) {
/* only output files when rendering a sequence -
diff --git a/source/blender/editors/space_image/image_ops.c b/source/blender/editors/space_image/image_ops.c
index 0cc35b0..89a818a 100644
--- a/source/blender/editors/space_image/image_ops.c
+++ b/source/blender/editors/space_image/image_ops.c
@@ -1214,7 +1214,7 @@ static int image_open_invoke(bContext *C, wmOperator *op, const wmEvent *UNUSED(
/* show multiview save options only if scene has multiviews */
prop = RNA_struct_find_property(op->ptr, "use_multiple_views");
- RNA_property_boolean_set(op->ptr, prop, (scene->r.scemode & R_MULTIVIEW));
+ RNA_property_boolean_set(op->ptr, prop, (scene->r.scemode & R_MULTIVIEW) != 0);
image_filesel(C, op, path);
@@ -2335,7 +2335,7 @@ static void image_new_draw(bContext *C, wmOperator *op)
uiLayout *layout = op->layout;
PointerRNA ptr;
Scene *scene = CTX_data_scene(C);
- const bool is_multiview = (scene->r.scemode & R_MULTIVIEW);
+ const bool is_multiview = (scene->r.scemode & R_MULTIVIEW) != 0;
RNA_pointer_create(NULL, op->type->srna, op->properties, &ptr);
diff --git a/source/blender/editors/space_node/drawnode.c b/source/blender/editors/space_node/drawnode.c
index b329012..65155b8 100644
--- a/source/blender/editors/space_node/drawnode.c
+++ b/source/blender/editors/space_node/drawnode.c
@@ -1681,14 +1681,14 @@ static void node_composit_buts_file_output_ex(uiLayout *layout, bContext *C, Poi
uiLayout *row, *col;
int active_index;
const bool multilayer = RNA_enum_get(&imfptr, "file_format") == R_IMF_IMTYPE_MULTILAYER;
- const bool multiview = scene->r.scemode & R_MULTIVIEW;
+ const bool is_multiview = (scene->r.scemode & R_MULTIVIEW) != 0;
node_composit_buts_file_output(layout, C, ptr);
uiTemplateImageSettings(layout, &imfptr, false);
/* disable stereo output for multilayer, too much work for something that no one will use */
/* if someone asks for that we can implement it */
- if (multiview)
+ if (is_multiview)
uiTemplateImageViews(layout, &imfptr);
uiItemS(layout);
@@ -1753,8 +1753,9 @@ static void node_composit_buts_file_output_ex(uiLayout *layout, bContext *C, Poi
uiLayoutSetActive(col, RNA_boolean_get(&active_input_ptr, "use_node_format") == false);
uiTemplateImageSettings(col, &imfptr, false);
- if (multiview)
+ if (is_multiview) {
uiTemplateImageViews(col, &imfptr);
+ }
}
}
}
diff --git a/source/blender/editors/space_sequencer/sequencer_add.c b/source/blender/editors/space_sequencer/sequencer_add.c
index da8e318..e0e59f8 100644
--- a/source/blender/editors/space_sequencer/sequencer_add.c
+++ b/source/blender/editors/space_sequencer/sequencer_add.c
@@ -651,7 +651,7 @@ static int sequencer_add_movie_strip_invoke(bContext *C, wmOperator *op, const w
/* show multiview save options only if scene has multiviews */
prop = RNA_struct_find_property(op->ptr, "use_multiple_views");
- RNA_property_boolean_set(op->ptr, prop, (scene->r.scemode & R_MULTIVIEW));
+ RNA_property_boolean_set(op->ptr, prop, (scene->r.scemode & R_MULTIVIEW) != 0);
WM_event_add_fileselect(C, op);
return OPERATOR_RUNNING_MODAL;
@@ -834,7 +834,7 @@ static int sequencer_add_image_strip_invoke(bContext *C, wmOperator *op, const w
/* show multiview save options only if scene has multiviews */
prop = RNA_struct_find_property(op->ptr, "use_multiple_views");
- RNA_property_boolean_set(op->ptr, prop, (scene->r.scemode & R_MULTIVIEW));
+ RNA_property_boolean_set(op->ptr, prop, (scene->r.scemode & R_MULTIVIEW) != 0);
WM_event_add_fileselect(C, op);
return OPERATOR_RUNNING_MODAL;
diff --git a/source/blender/windowmanager/intern/wm_stereo.c b/source/blender/windowmanager/intern/wm_stereo.c
index 5cfc360..048e0ed 100644
--- a/source/blender/windowmanager/intern/wm_stereo.c
+++ b/source/blender/windowmanager/intern/wm_stereo.c
@@ -393,7 +393,7 @@ static bool wm_stereo3d_required(const bContext *C, bScreen *screen)
SpaceNode *snode;
SpaceSeq *sseq;
Scene *sce = CTX_data_scene(C);
- const bool is_multiview = (sce->r.scemode & R_MULTIVIEW);
+ const bool is_multiview = (sce->r.scemode & R_MULTIVIEW) != 0;
for (sa = screen->areabase.first; sa; sa = sa->next) {
switch (sa->spacetype) {
More information about the Bf-blender-cvs
mailing list