diff options
author | Campbell Barton <ideasman42@gmail.com> | 2018-05-20 09:52:10 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2018-05-20 09:52:56 +0300 |
commit | 12eb29fe355bc17dacf094e8e9d6edc1d8b877f0 (patch) | |
tree | b4297f5992c2263dbc3f986f20bc3edad99af4b0 /source/blender/editors | |
parent | 96a3a628613bfd592aea5fcdfbb196bb61dfacb7 (diff) |
Cleanup: whitespace, duplicate includes
Diffstat (limited to 'source/blender/editors')
6 files changed, 12 insertions, 11 deletions
diff --git a/source/blender/editors/mesh/editmesh_add_manipulator.c b/source/blender/editors/mesh/editmesh_add_manipulator.c index 65e12e673af..bfeccfe33a4 100644 --- a/source/blender/editors/mesh/editmesh_add_manipulator.c +++ b/source/blender/editors/mesh/editmesh_add_manipulator.c @@ -154,7 +154,7 @@ static void manipulator_mesh_placement_update_from_op(ManipulatorPlacementGroup UNUSED_VARS(op); /* For now don't read back from the operator. */ #if 0 - RNA_property_float_get_array(op->ptr, man->data.prop_matrix, &man->cage->matrix_offset[0][0]); + RNA_property_float_get_array(op->ptr, man->data.prop_matrix, &man->cage->matrix_offset[0][0]); #endif } diff --git a/source/blender/editors/mesh/editmesh_intersect.c b/source/blender/editors/mesh/editmesh_intersect.c index 4d76dba4c3a..ad76f0c66f1 100644 --- a/source/blender/editors/mesh/editmesh_intersect.c +++ b/source/blender/editors/mesh/editmesh_intersect.c @@ -788,7 +788,7 @@ static int edbm_face_split_by_edges_exec(bContext *C, wmOperator *UNUSED(op)) /* check we're in the correct corner (works with convex loops too) */ if (angle_signed_on_axis_v3v3v3_v3(l->prev->v->co, l->v->co, v_other->co, l->f->no) < - angle_signed_on_axis_v3v3v3_v3(l->prev->v->co, l->v->co, l->next->v->co, l->f->no)) + angle_signed_on_axis_v3v3v3_v3(l->prev->v->co, l->v->co, l->next->v->co, l->f->no)) { dot_best = dot_test; l_best = l; diff --git a/source/blender/editors/mesh/editmesh_tools.c b/source/blender/editors/mesh/editmesh_tools.c index 3782b9e2c10..0c13c900dee 100644 --- a/source/blender/editors/mesh/editmesh_tools.c +++ b/source/blender/editors/mesh/editmesh_tools.c @@ -899,7 +899,7 @@ static int edbm_add_edge_face_exec(bContext *C, wmOperator *op) /* cancel if nothing was done */ if ((totedge_orig == em->bm->totedge) && - (totface_orig == em->bm->totface)) + (totface_orig == em->bm->totface)) { EDBM_op_finish(em, &bmop, op, true); continue; @@ -908,8 +908,8 @@ static int edbm_add_edge_face_exec(bContext *C, wmOperator *op) /* normally we would want to leave the new geometry selected, * but being able to press F many times to add geometry is too useful! */ if (ele_desel && - (BMO_slot_buffer_count(bmop.slots_out, "faces.out") == 1) && - (ele_desel_face = BMO_slot_buffer_get_first(bmop.slots_out, "faces.out"))) + (BMO_slot_buffer_count(bmop.slots_out, "faces.out") == 1) && + (ele_desel_face = BMO_slot_buffer_get_first(bmop.slots_out, "faces.out"))) { edbm_add_edge_face_exec__tricky_finalize_sel(em->bm, ele_desel, ele_desel_face); } @@ -1461,7 +1461,7 @@ static int edbm_vert_connect_path_exec(bContext *C, wmOperator *op) /* when there is only 2 vertices, we can ignore selection order */ if (is_pair) { - if(!edbm_connect_vert_pair(em, op)) { + if (!edbm_connect_vert_pair(em, op)) { failed_connect_len++; } continue; diff --git a/source/blender/editors/object/object_edit.c b/source/blender/editors/object/object_edit.c index a2e91761a38..364a85c4248 100644 --- a/source/blender/editors/object/object_edit.c +++ b/source/blender/editors/object/object_edit.c @@ -1645,7 +1645,7 @@ static void move_to_collection_menu_create(bContext *UNUSED(C), uiLayout *layout uiItemIntO(layout, name, ICON_NONE, - menu->ot->idname, + menu->ot->idname, "collection_index", menu->index); uiItemS(layout); diff --git a/source/blender/editors/space_outliner/outliner_collections.c b/source/blender/editors/space_outliner/outliner_collections.c index 9bb3871c247..c44345a168b 100644 --- a/source/blender/editors/space_outliner/outliner_collections.c +++ b/source/blender/editors/space_outliner/outliner_collections.c @@ -88,11 +88,11 @@ Collection *outliner_collection_from_tree_element(const TreeElement *te) return lc->collection; } else if (ELEM(tselem->type, TSE_SCENE_COLLECTION_BASE, TSE_VIEW_COLLECTION_BASE)) { - Scene *scene = (Scene*)tselem->id; + Scene *scene = (Scene *)tselem->id; return BKE_collection_master(scene); } else if (tselem->type == 0 && te->idcode == ID_GR) { - return (Collection*)tselem->id; + return (Collection *)tselem->id; } return NULL; diff --git a/source/blender/editors/space_outliner/outliner_tree.c b/source/blender/editors/space_outliner/outliner_tree.c index 58ab8f3735e..393b40d1097 100644 --- a/source/blender/editors/space_outliner/outliner_tree.c +++ b/source/blender/editors/space_outliner/outliner_tree.c @@ -1525,7 +1525,7 @@ BLI_INLINE void outliner_add_collection_objects( } static TreeElement *outliner_add_collection_recursive( - SpaceOops *soops, Collection *collection, TreeElement *ten) + SpaceOops *soops, Collection *collection, TreeElement *ten) { outliner_add_collection_init(ten, collection); @@ -1805,7 +1805,8 @@ static TreeElement *outliner_find_first_desired_element_at_y( bool (*callback_test)(TreeElement *); if ((soops->outlinevis == SO_VIEW_LAYER) && - (soops->filter & SO_FILTER_NO_COLLECTION)) { + (soops->filter & SO_FILTER_NO_COLLECTION)) + { callback_test = test_object_callback; } else { |