[Bf-blender-cvs] [da638d4] master: Style cleanup
Campbell Barton
noreply at git.blender.org
Thu Jul 31 18:03:51 CEST 2014
Commit: da638d49e3056a319013e4cee22dd322309ea75f
Author: Campbell Barton
Date: Fri Aug 1 02:03:09 2014 +1000
Branches: master
https://developer.blender.org/rBda638d49e3056a319013e4cee22dd322309ea75f
Style cleanup
===================================================================
M source/blender/blenkernel/intern/depsgraph.c
M source/blender/editors/armature/pose_select.c
M source/blender/editors/mesh/editmesh_tools.c
===================================================================
diff --git a/source/blender/blenkernel/intern/depsgraph.c b/source/blender/blenkernel/intern/depsgraph.c
index aaf0013..5e01f9a 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 6138661..76284ba 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 3609abf..92bbd94 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);
More information about the Bf-blender-cvs
mailing list