diff options
8 files changed, 16 insertions, 16 deletions
diff --git a/source/blender/blenkernel/intern/subdiv_eval.c b/source/blender/blenkernel/intern/subdiv_eval.c index 8621b1f87f9..e23be84ee26 100644 --- a/source/blender/blenkernel/intern/subdiv_eval.c +++ b/source/blender/blenkernel/intern/subdiv_eval.c @@ -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); } } } diff --git a/source/blender/blenkernel/intern/subdiv_mesh.c b/source/blender/blenkernel/intern/subdiv_mesh.c index a58dbdcff84..bb27cb6a31e 100644 --- a/source/blender/blenkernel/intern/subdiv_mesh.c +++ b/source/blender/blenkernel/intern/subdiv_mesh.c @@ -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; diff --git a/source/blender/compositor/operations/COM_CryptomatteOperation.cpp b/source/blender/compositor/operations/COM_CryptomatteOperation.cpp index f3fa81075c6..9a1cbdd7a00 100644 --- a/source/blender/compositor/operations/COM_CryptomatteOperation.cpp +++ b/source/blender/compositor/operations/COM_CryptomatteOperation.cpp @@ -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); diff --git a/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc b/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc index e20b589bf22..efd57734b48 100644 --- a/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc +++ b/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc @@ -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; } diff --git a/source/blender/draw/engines/gpencil/gpencil_engine.c b/source/blender/draw/engines/gpencil/gpencil_engine.c index 668869a2f89..3f64d72d354 100644 --- a/source/blender/draw/engines/gpencil/gpencil_engine.c +++ b/source/blender/draw/engines/gpencil/gpencil_engine.c @@ -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); diff --git a/source/blender/editors/gpencil/gpencil_add_stroke.c b/source/blender/editors/gpencil/gpencil_add_stroke.c index ebe07fe417f..f932f98ac1d 100644 --- a/source/blender/editors/gpencil/gpencil_add_stroke.c +++ b/source/blender/editors/gpencil/gpencil_add_stroke.c @@ -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 */ diff --git a/source/blender/editors/gpencil/gpencil_brush.c b/source/blender/editors/gpencil/gpencil_brush.c index aed55c15b19..ff93e7fc57d 100644 --- a/source/blender/editors/gpencil/gpencil_brush.c +++ b/source/blender/editors/gpencil/gpencil_brush.c @@ -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; diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpencilmirror.c b/source/blender/gpencil_modifiers/intern/MOD_gpencilmirror.c index 6c54d4c49be..4c359be670f 100644 --- a/source/blender/gpencil_modifiers/intern/MOD_gpencilmirror.c +++ b/source/blender/gpencil_modifiers/intern/MOD_gpencilmirror.c @@ -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); |