diff options
author | Campbell Barton <ideasman42@gmail.com> | 2018-12-20 00:01:39 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2018-12-20 00:03:48 +0300 |
commit | 65bc9313067426b12580ce53aa6d77d42c7d200f (patch) | |
tree | 686cd3b450bae25fc5ee55c36680a1343d5b0d7d /source/blender/editors | |
parent | 1ce9a142b6abda92e20886d54b79c9de74099f5a (diff) |
Cleanup: argument wrapping indentation
Diffstat (limited to 'source/blender/editors')
-rw-r--r-- | source/blender/editors/gpencil/gpencil_primitive.c | 6 | ||||
-rw-r--r-- | source/blender/editors/gpencil/gpencil_utils.c | 9 | ||||
-rw-r--r-- | source/blender/editors/io/io_collada.c | 64 | ||||
-rw-r--r-- | source/blender/editors/object/object_modifier.c | 56 | ||||
-rw-r--r-- | source/blender/editors/uvedit/uvedit_smart_stitch.c | 2 |
5 files changed, 73 insertions, 64 deletions
diff --git a/source/blender/editors/gpencil/gpencil_primitive.c b/source/blender/editors/gpencil/gpencil_primitive.c index efdcb263ec5..a6c6c31a9ad 100644 --- a/source/blender/editors/gpencil/gpencil_primitive.c +++ b/source/blender/editors/gpencil/gpencil_primitive.c @@ -904,9 +904,9 @@ static void gp_primitive_update_strokes(bContext *C, tGPDprimitive *tgpi) /* convert screen-coordinates to 3D coordinates */ gp_stroke_convertcoords_tpoint( - tgpi->scene, tgpi->ar, tgpi->ob, tgpi->gpl, - p2d, depth_arr ? depth_arr + i : NULL, - &pt->x); + tgpi->scene, tgpi->ar, tgpi->ob, tgpi->gpl, + p2d, depth_arr ? depth_arr + i : NULL, + &pt->x); pt->pressure = pressure; pt->strength = strength; diff --git a/source/blender/editors/gpencil/gpencil_utils.c b/source/blender/editors/gpencil/gpencil_utils.c index 22a7e68d825..ee0d80b7c26 100644 --- a/source/blender/editors/gpencil/gpencil_utils.c +++ b/source/blender/editors/gpencil/gpencil_utils.c @@ -1257,10 +1257,11 @@ void ED_gpencil_add_defaults(bContext *C) ts->gp_sculpt.cur_falloff = curvemapping_add(1, 0.0f, 0.0f, 1.0f, 1.0f); CurveMapping *gp_falloff_curve = ts->gp_sculpt.cur_falloff; curvemapping_initialize(gp_falloff_curve); - curvemap_reset(gp_falloff_curve->cm, - &gp_falloff_curve->clipr, - CURVE_PRESET_GAUSS, - CURVEMAP_SLOPE_POSITIVE); + curvemap_reset( + gp_falloff_curve->cm, + &gp_falloff_curve->clipr, + CURVE_PRESET_GAUSS, + CURVEMAP_SLOPE_POSITIVE); } } diff --git a/source/blender/editors/io/io_collada.c b/source/blender/editors/io/io_collada.c index a022d750000..943f6743ec0 100644 --- a/source/blender/editors/io/io_collada.c +++ b/source/blender/editors/io/io_collada.c @@ -650,36 +650,40 @@ void WM_OT_collada_import(wmOperatorType *ot) ot, FILE_TYPE_FOLDER | FILE_TYPE_COLLADA, FILE_BLENDER, FILE_OPENFILE, WM_FILESEL_FILEPATH, FILE_DEFAULTDISPLAY, FILE_SORT_ALPHA); - RNA_def_boolean(ot->srna, - "import_units", 0, "Import Units", - "If disabled match import to Blender's current Unit settings, " - "otherwise use the settings from the Imported scene"); - - RNA_def_boolean(ot->srna, - "fix_orientation", 0, "Fix Leaf Bones", - "Fix Orientation of Leaf Bones (Collada does only support Joints)"); - - RNA_def_boolean(ot->srna, - "find_chains", 0, "Find Bone Chains", - "Find best matching Bone Chains and ensure bones in chain are connected"); - - RNA_def_boolean(ot->srna, - "auto_connect", 0, "Auto Connect", - "Set use_connect for parent bones which have exactly one child bone"); - - RNA_def_int(ot->srna, - "min_chain_length", - 0, - 0, - INT_MAX, - "Minimum Chain Length", - "When searching Bone Chains disregard chains of length below this value", - 0, - INT_MAX); - - RNA_def_boolean(ot->srna, - "keep_bind_info", 0, "Keep Bind Info", - "Store Bindpose information in custom bone properties for later use during Collada export"); + RNA_def_boolean( + ot->srna, + "import_units", 0, "Import Units", + "If disabled match import to Blender's current Unit settings, " + "otherwise use the settings from the Imported scene"); + + RNA_def_boolean( + ot->srna, + "fix_orientation", 0, "Fix Leaf Bones", + "Fix Orientation of Leaf Bones (Collada does only support Joints)"); + + RNA_def_boolean( + ot->srna, + "find_chains", 0, "Find Bone Chains", + "Find best matching Bone Chains and ensure bones in chain are connected"); + + RNA_def_boolean( + ot->srna, + "auto_connect", 0, "Auto Connect", + "Set use_connect for parent bones which have exactly one child bone"); + + RNA_def_int( + ot->srna, + "min_chain_length", + 0, + 0, INT_MAX, + "Minimum Chain Length", + "When searching Bone Chains disregard chains of length below this value", + 0, INT_MAX); + + RNA_def_boolean( + ot->srna, + "keep_bind_info", 0, "Keep Bind Info", + "Store Bindpose information in custom bone properties for later use during Collada export"); } #endif diff --git a/source/blender/editors/object/object_modifier.c b/source/blender/editors/object/object_modifier.c index 45dcf5a2f62..2be86773057 100644 --- a/source/blender/editors/object/object_modifier.c +++ b/source/blender/editors/object/object_modifier.c @@ -1593,10 +1593,10 @@ static int skin_loose_mark_clear_exec(bContext *C, wmOperator *op) BM_ITER_MESH (bm_vert, &bm_iter, bm, BM_VERTS_OF_MESH) { if (BM_elem_flag_test(bm_vert, BM_ELEM_SELECT)) { - MVertSkin *vs = CustomData_bmesh_get(&bm->vdata, - bm_vert->head.data, - CD_MVERT_SKIN); - + MVertSkin *vs = CustomData_bmesh_get( + &bm->vdata, + bm_vert->head.data, + CD_MVERT_SKIN); switch (action) { case SKIN_LOOSE_MARK: @@ -1650,9 +1650,10 @@ static int skin_radii_equalize_exec(bContext *C, wmOperator *UNUSED(op)) BM_ITER_MESH (bm_vert, &bm_iter, bm, BM_VERTS_OF_MESH) { if (BM_elem_flag_test(bm_vert, BM_ELEM_SELECT)) { - MVertSkin *vs = CustomData_bmesh_get(&bm->vdata, - bm_vert->head.data, - CD_MVERT_SKIN); + MVertSkin *vs = CustomData_bmesh_get( + &bm->vdata, + bm_vert->head.data, + CD_MVERT_SKIN); float avg = (vs->radius[0] + vs->radius[1]) * 0.5f; vs->radius[0] = vs->radius[1] = avg; @@ -1718,13 +1719,14 @@ static void skin_armature_bone_create(Object *skin_ob, ED_vgroup_vert_add(skin_ob, dg, v, 1, WEIGHT_REPLACE); } - skin_armature_bone_create(skin_ob, - mvert, medge, - arm, - edges_visited, - emap, - bone, - v); + skin_armature_bone_create( + skin_ob, + mvert, medge, + arm, + edges_visited, + emap, + bone, + v); } } @@ -1748,11 +1750,12 @@ static Object *modifier_skin_armature_create(Depsgraph *depsgraph, Main *bmain, mvert = me_eval_deform->mvert; /* add vertex weights to original mesh */ - CustomData_add_layer(&me->vdata, - CD_MDEFORMVERT, - CD_CALLOC, - NULL, - me->totvert); + CustomData_add_layer( + &me->vdata, + CD_MDEFORMVERT, + CD_CALLOC, + NULL, + me->totvert); ViewLayer *view_layer = DEG_get_input_view_layer(depsgraph); arm_ob = BKE_object_add(bmain, scene, view_layer, OB_ARMATURE, NULL); @@ -1789,13 +1792,14 @@ static Object *modifier_skin_armature_create(Depsgraph *depsgraph, Main *bmain, } if (emap[v].count >= 1) { - skin_armature_bone_create(skin_ob, - mvert, me->medge, - arm, - edges_visited, - emap, - bone, - v); + skin_armature_bone_create( + skin_ob, + mvert, me->medge, + arm, + edges_visited, + emap, + bone, + v); } } } diff --git a/source/blender/editors/uvedit/uvedit_smart_stitch.c b/source/blender/editors/uvedit/uvedit_smart_stitch.c index 07184249d2c..b7103ad90f0 100644 --- a/source/blender/editors/uvedit/uvedit_smart_stitch.c +++ b/source/blender/editors/uvedit/uvedit_smart_stitch.c @@ -981,7 +981,7 @@ static void stitch_propagate_uv_final_position( int face_preview_pos = preview_position[BM_elem_index_get(element_iter->l->f)].data_position; if (face_preview_pos != STITCH_NO_PREVIEW) { copy_v2_v2(preview->preview_polys + face_preview_pos + 2 * element_iter->loop_of_poly_index, - final_position[index].uv); + final_position[index].uv); } } |