Commit: 1077514896688e4f439cbd20e0f0c65c88048978
Author: Campbell Barton
Date: Sat Jul 2 10:00:30 2016 +1000
Branches: master
https://developer.blender.org/rB1077514896688e4f439cbd20e0f0c65c88048978
Cleanup: style
===================================================================
M source/blender/editors/object/object_constraint.c
M source/blender/editors/space_outliner/outliner_edit.c
M source/blender/editors/space_view3d/drawmesh.c
===================================================================
diff --git a/source/blender/editors/object/object_constraint.c
b/source/blender/editors/object/object_constraint.c
index 9c2806f..d7b7fd7 100644
--- a/source/blender/editors/object/object_constraint.c
+++ b/source/blender/editors/object/object_constraint.c
@@ -1651,7 +1651,7 @@ static bool get_new_constraint_target(bContext *C, int
con_type, Object **tar_ob
break;
}
else if (((!only_curve) || (ob->type ==
OB_CURVE)) &&
- ((!only_mesh) || (ob->type == OB_MESH)))
+ ((!only_mesh) || (ob->type ==
OB_MESH)))
{
/* set target */
*tar_ob = ob;
diff --git a/source/blender/editors/space_outliner/outliner_edit.c
b/source/blender/editors/space_outliner/outliner_edit.c
index 7990c16..07608b5 100644
--- a/source/blender/editors/space_outliner/outliner_edit.c
+++ b/source/blender/editors/space_outliner/outliner_edit.c
@@ -857,7 +857,7 @@ void object_toggle_selectability_cb(
}
void group_toggle_selectability_cb(
- bContext *UNUSED(C), ReportList *reports, Scene *scene, TreeElement
*UNUSED(te),
+ bContext *UNUSED(C), ReportList *UNUSED(reports), Scene *scene,
TreeElement *UNUSED(te),
TreeStoreElem *UNUSED(tsep), TreeStoreElem *tselem, void
*UNUSED(user_data))
{
Group *group = (Group *)tselem->id;
diff --git a/source/blender/editors/space_view3d/drawmesh.c
b/source/blender/editors/space_view3d/drawmesh.c
index e0cba8d..791ece1 100644
--- a/source/blender/editors/space_view3d/drawmesh.c
+++ b/source/blender/editors/space_view3d/drawmesh.c
@@ -986,7 +986,8 @@ static void draw_mesh_textured_old(Scene *scene, View3D
*v3d, RegionView3D *rv3d
else if ((ob->mode & OB_MODE_TEXTURE_PAINT) == 0) {
dm_draw_flag |= DM_DRAW_USE_COLORS;
}
- } else {
+ }
+ else {
if ((ob->mode & OB_MODE_TEXTURE_PAINT) == 0) {
dm_draw_flag |= DM_DRAW_USE_COLORS;
}
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
