[Bf-blender-cvs] [28057d54de9] master: Cleanup: clang-format

[Campbell Barton]

Commit: 28057d54de98687ed6ffdd47c2fcbb2e40f31d2e
Author: Campbell Barton
Date:   Sun Jul 7 23:45:35 2019 +1000
Branches: master
https://developer.blender.org/rB28057d54de98687ed6ffdd47c2fcbb2e40f31d2e

Cleanup: clang-format

===================================================================

M	intern/cycles/util/util_logging.cpp
M	source/blender/editors/include/ED_transform_snap_object_context.h
M	source/blender/editors/transform/transform_snap_object.c

===================================================================

diff --git a/intern/cycles/util/util_logging.cpp b/intern/cycles/util/util_logging.cpp
index cc1e328ba6d..e41250ab1b9 100644
--- a/intern/cycles/util/util_logging.cpp
+++ b/intern/cycles/util/util_logging.cpp
@@ -29,7 +29,7 @@ CCL_NAMESPACE_BEGIN
 static bool is_verbosity_set()
 {
 #ifdef WITH_CYCLES_LOGGING
-using CYCLES_GFLAGS_NAMESPACE::GetCommandLineOption;
+  using CYCLES_GFLAGS_NAMESPACE::GetCommandLineOption;
 
   std::string verbosity;
   if (!GetCommandLineOption("v", &verbosity)) {
@@ -37,7 +37,7 @@ using CYCLES_GFLAGS_NAMESPACE::GetCommandLineOption;
   }
   return verbosity != "0";
 #else
-	return false;
+  return false;
 #endif
 }
 
diff --git a/source/blender/editors/include/ED_transform_snap_object_context.h b/source/blender/editors/include/ED_transform_snap_object_context.h
index dab3bfe4b6d..f27523bb1f8 100644
--- a/source/blender/editors/include/ED_transform_snap_object_context.h
+++ b/source/blender/editors/include/ED_transform_snap_object_context.h
@@ -122,15 +122,15 @@ bool ED_transform_snap_object_project_ray_all(SnapObjectContext *sctx,
                                               struct ListBase *r_hit_list);
 
 short ED_transform_snap_object_project_view3d_ex(struct SnapObjectContext *sctx,
-                                                const unsigned short snap_to,
-                                                const struct SnapObjectParams *params,
-                                                const float mval[2],
-                                                float *dist_px,
-                                                float r_loc[3],
-                                                float r_no[3],
-                                                int *r_index,
-                                                struct Object **r_ob,
-                                                float r_obmat[4][4]);
+                                                 const unsigned short snap_to,
+                                                 const struct SnapObjectParams *params,
+                                                 const float mval[2],
+                                                 float *dist_px,
+                                                 float r_loc[3],
+                                                 float r_no[3],
+                                                 int *r_index,
+                                                 struct Object **r_ob,
+                                                 float r_obmat[4][4]);
 bool ED_transform_snap_object_project_view3d(struct SnapObjectContext *sctx,
                                              const unsigned short snap_to,
                                              const struct SnapObjectParams *params,
diff --git a/source/blender/editors/transform/transform_snap_object.c b/source/blender/editors/transform/transform_snap_object.c
index aa31d1fc987..6f06f8639bd 100644
--- a/source/blender/editors/transform/transform_snap_object.c
+++ b/source/blender/editors/transform/transform_snap_object.c
@@ -2821,15 +2821,15 @@ static short transform_snap_context_project_view3d_mixed_impl(
 }
 
 short ED_transform_snap_object_project_view3d_ex(SnapObjectContext *sctx,
-                                                const unsigned short snap_to,
-                                                const struct SnapObjectParams *params,
-                                                const float mval[2],
-                                                float *dist_px,
-                                                float r_loc[3],
-                                                float r_no[3],
-                                                int *r_index,
-                                                Object **r_ob,
-                                                float r_obmat[4][4])
+                                                 const unsigned short snap_to,
+                                                 const struct SnapObjectParams *params,
+                                                 const float mval[2],
+                                                 float *dist_px,
+                                                 float r_loc[3],
+                                                 float r_no[3],
+                                                 int *r_index,
+                                                 Object **r_ob,
+                                                 float r_obmat[4][4])
 {
   return transform_snap_context_project_view3d_mixed_impl(
              sctx, snap_to, params, mval, dist_px, r_loc, r_no, r_index, r_ob, r_obmat) != 0;
@@ -2856,7 +2856,7 @@ bool ED_transform_snap_object_project_view3d(SnapObjectContext *sctx,
                                              float r_no[3])
 {
   return ED_transform_snap_object_project_view3d_ex(
-      sctx, snap_to, params, mval, dist_px, r_loc, r_no, NULL, NULL, NULL) != 0;
+             sctx, snap_to, params, mval, dist_px, r_loc, r_no, NULL, NULL, NULL) != 0;
 }
 
 /**