diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2014-07-31 20:03:09 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2014-07-31 20:03:09 +0400 |
| commit | da638d49e3056a319013e4cee22dd322309ea75f (patch) | |
| tree | 6fb4e648d25fbef6c2cc914e6ed85afa56b77aa7 /source/blender | |
| parent | 5e3af04b0865432c9c35f75fc3390bd881d538f5 (diff) | |
Style cleanup
Diffstat (limited to 'source/blender')
| -rw-r--r-- | source/blender/blenkernel/intern/depsgraph.c | 2 | ||||
| -rw-r--r-- | source/blender/editors/armature/pose_select.c | 3 | ||||
| -rw-r--r-- | source/blender/editors/mesh/editmesh_tools.c | 2 |
3 files changed, 5 insertions, 2 deletions
diff --git a/source/blender/blenkernel/intern/depsgraph.c b/source/blender/blenkernel/intern/depsgraph.c index aaf001316b1..5e01f9add1e 100644 --- a/source/blender/blenkernel/intern/depsgraph.c +++ b/source/blender/blenkernel/intern/depsgraph.c @@ -705,7 +705,7 @@ static void build_dag_object(DagForest *dag, DagNode *scenenode, Scene *scene, O ListBase *duplilist; DupliObject *dob; duplilist = object_duplilist(G.main->eval_ctx, scene, ob); - for (dob= duplilist->first; dob; dob = dob->next) { + for (dob = duplilist->first; dob; dob = dob->next) { node2 = dag_get_node(dag, dob->ob); dag_add_relation(dag, node, node2, DAG_RL_DATA_DATA | DAG_RL_OB_DATA, "Object Font"); } diff --git a/source/blender/editors/armature/pose_select.c b/source/blender/editors/armature/pose_select.c index 61386615934..76284ba44de 100644 --- a/source/blender/editors/armature/pose_select.c +++ b/source/blender/editors/armature/pose_select.c @@ -70,7 +70,8 @@ /* ***************** Pose Select Utilities ********************* */ /* Note: SEL_TOGGLE is assumed to have already been handled! */ -static void pose_do_bone_select(bPoseChannel *pchan, const int select_mode) { +static void pose_do_bone_select(bPoseChannel *pchan, const int select_mode) +{ /* select pchan only if selectable, but deselect works always */ switch (select_mode) { case SEL_SELECT: diff --git a/source/blender/editors/mesh/editmesh_tools.c b/source/blender/editors/mesh/editmesh_tools.c index 3609abf6cb5..92bbd9482e2 100644 --- a/source/blender/editors/mesh/editmesh_tools.c +++ b/source/blender/editors/mesh/editmesh_tools.c @@ -3496,7 +3496,9 @@ static int edbm_dissolve_verts_exec(bContext *C, wmOperator *op) if (!EDBM_op_callf(em, op, "dissolve_verts verts=%hv use_face_split=%b use_boundary_tear=%b", BM_ELEM_SELECT, use_face_split, use_boundary_tear)) + { return OPERATOR_CANCELLED; + } EDBM_update_generic(em, true, true); |