Cleanup: style
authorCampbell Barton <ideasman42@gmail.com>
Wed, 8 Aug 2018 00:59:50 +0000 (10:59 +1000)
committerCampbell Barton <ideasman42@gmail.com>
Wed, 8 Aug 2018 00:59:50 +0000 (10:59 +1000)
source/blender/blenkernel/intern/subdiv_eval.c
source/blender/blenkernel/intern/subdiv_mesh.c
source/blender/compositor/operations/COM_CryptomatteOperation.cpp
source/blender/depsgraph/intern/builder/deg_builder_nodes.cc
source/blender/draw/engines/gpencil/gpencil_engine.c
source/blender/editors/gpencil/gpencil_add_stroke.c
source/blender/editors/gpencil/gpencil_brush.c
source/blender/gpencil_modifiers/intern/MOD_gpencilmirror.c

index 8621b1f87f90d85e64b01f99089c9b0689d6dce8..e23be84ee265eb04234d06081ca765b88e6eca64 100644 (file)
@@ -122,11 +122,11 @@ static void set_face_varying_data_from_uv(Subdiv *subdiv,
                     vertex_index < num_face_vertices;
                     vertex_index++, mluv++)
                {
-               evaluator->setFaceVaryingData(evaluator,
-                                      layer_index,
-                                             mluv->uv,
-                                             uv_indicies[vertex_index],
-                                             1);
+                       evaluator->setFaceVaryingData(evaluator,
+                                                     layer_index,
+                                                     mluv->uv,
+                                                     uv_indicies[vertex_index],
+                                                     1);
                }
        }
 }
index a58dbdcff841db4f08c8421bda3fd10e873c6978..bb27cb6a31e0b9de139490962850a5f2ea17c221 100644 (file)
@@ -2251,7 +2251,7 @@ static void points_for_loose_edges_interpolation_get(
         SubdivMeshContext *ctx,
         const MEdge *coarse_edge,
         const MEdge *neighbors[2],
-               float points_r[4][3])
+        float points_r[4][3])
 {
        const Mesh *coarse_mesh = ctx->coarse_mesh;
        const MVert *coarse_mvert = coarse_mesh->mvert;
index f3fa81075c61ade7a85b3d5055ce3d6ec6476dc1..9a1cbdd7a00a1b30d94b01952260be1628a83479 100644 (file)
@@ -22,7 +22,7 @@
 
 CryptomatteOperation::CryptomatteOperation(size_t num_inputs) : NodeOperation()
 {
-       for(size_t i = 0; i < num_inputs; i++) {
+       for (size_t i = 0; i < num_inputs; i++) {
                this->addInputSocket(COM_DT_COLOR);
        }
        inputs.resize(num_inputs);
index e20b589bf221aaf44d8d9b075c9490de921e73a0..efd57734b484eb60e9abf6bf650767840aa7aa63 100644 (file)
@@ -1233,9 +1233,9 @@ void DepsgraphNodeBuilder::build_object_data_geometry_datablock(ID *obdata)
                                                     DEG_NODE_TYPE_GEOMETRY,
                                                     function_bind(BKE_gpencil_eval_geometry,
                                                                   _1,
-                                                                                                          (bGPdata *)obdata_cow),
-                                                                                                          DEG_OPCODE_PLACEHOLDER,
-                                                                  "Geometry Eval");
+                                                                  (bGPdata *)obdata_cow),
+                                                    DEG_OPCODE_PLACEHOLDER,
+                                                    "Geometry Eval");
                        op_node->set_as_entry();
                        break;
                }
index 668869a2f8903697186ee429ac5a4ecb8fab3b78..3f64d72d35436b97526e547630a54859458e5d0c 100644 (file)
@@ -329,7 +329,7 @@ void GPENCIL_cache_init(void *vedata)
                /* detect if playing animation */
                stl->storage->is_playing = false;
                if (draw_ctx->evil_C) {
-                       stl->storage->is_playing = ED_screen_animation_playing(CTX_wm_manager(draw_ctx->evil_C)) != NULL ? true : false;
+                       stl->storage->is_playing = ED_screen_animation_playing(CTX_wm_manager(draw_ctx->evil_C)) != NULL;
                }
 
                if (obact_gpd) {
@@ -724,7 +724,7 @@ void GPENCIL_draw_scene(void *ved)
                                }
                                /* fx passes */
                                if ((!stl->storage->simplify_fx) &&
-                                       (BKE_shaderfx_has_gpencil(ob)))
+                                   (BKE_shaderfx_has_gpencil(ob)))
                                {
                                        stl->storage->tonemapping = 0;
                                        DRW_gpencil_fx_draw(&e_data, vedata, cache);
index ebe07fe417ffe23582c5cbbd4182b47d22e2d1b6..f932f98ac1d8fdfe87402e96b99700aba6455712 100644 (file)
@@ -23,7 +23,7 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
-/** \file blender/editors/gpencil/gpencil_add_monkey.c
+/** \file blender/editors/gpencil/gpencil_add_stroke.c
  *  \ingroup edgpencil
  */
 
index aed55c15b1938185c98561796a2537613d94c275..ff93e7fc57d9331b22518657a3fb67a530194700 100644 (file)
@@ -1814,7 +1814,7 @@ static int gpsculpt_brush_invoke(bContext *C, wmOperator *op, const wmEvent *eve
 {
        tGP_BrushEditData *gso = NULL;
        const bool is_modal = RNA_boolean_get(op->ptr, "wait_for_input");
-       const bool is_playing = ED_screen_animation_playing(CTX_wm_manager(C)) != NULL ? true : false;
+       const bool is_playing = ED_screen_animation_playing(CTX_wm_manager(C)) != NULL;
        bool needs_timer = false;
        float brush_rate = 0.0f;
 
index 6c54d4c49be9325e016b99fad74be8a02de5f9db..4c359be670f23a47af73305939475d76e0b44a77 100644 (file)
@@ -124,8 +124,8 @@ static void generateStrokes(
 
                        for (i = 0, gps = gpf->strokes.first; i < tot_strokes; i++, gps = gps->next) {
                                if (is_stroke_affected_by_modifier(
-                                       ob, mmd->layername, mmd->pass_index, 1, gpl, gps,
-                                       mmd->flag & GP_MIRROR_INVERT_LAYER, mmd->flag & GP_MIRROR_INVERT_PASS))
+                                           ob, mmd->layername, mmd->pass_index, 1, gpl, gps,
+                                           mmd->flag & GP_MIRROR_INVERT_LAYER, mmd->flag & GP_MIRROR_INVERT_PASS))
                                {
                                        gps_new = BKE_gpencil_stroke_duplicate(gps);
                                        update_position(ob, mmd, gps_new, xi);