Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Cleanup: clang-format

Browse Source
This commit is contained in:
Campbell Barton
2019-07-07 23:45:35 +10:00
parent 9e12d762a2
commit 28057d54de
3 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
intern/cycles/util/util_logging.cpp
View File

@@ -29,7 +29,7 @@ CCL_NAMESPACE_BEGIN
static bool is_verbosity_set() static bool is_verbosity_set()
{ {
#ifdef WITH_CYCLES_LOGGING #ifdef WITH_CYCLES_LOGGING
using CYCLES_GFLAGS_NAMESPACE::GetCommandLineOption; using CYCLES_GFLAGS_NAMESPACE::GetCommandLineOption;
std::string verbosity; std::string verbosity;
if (!GetCommandLineOption("v", &verbosity)) { if (!GetCommandLineOption("v", &verbosity)) {
@@ -37,7 +37,7 @@ using CYCLES_GFLAGS_NAMESPACE::GetCommandLineOption;
} }
return verbosity != "0"; return verbosity != "0";
#else #else
return false; return false;
#endif #endif
} }

18
source/blender/editors/include/ED_transform_snap_object_context.h
View File

@@ -122,15 +122,15 @@ bool ED_transform_snap_object_project_ray_all(SnapObjectContext *sctx,
struct ListBase *r_hit_list); struct ListBase *r_hit_list);
short ED_transform_snap_object_project_view3d_ex(struct SnapObjectContext *sctx, short ED_transform_snap_object_project_view3d_ex(struct SnapObjectContext *sctx,
const unsigned short snap_to, const unsigned short snap_to,
const struct SnapObjectParams *params, const struct SnapObjectParams *params,
const float mval[2], const float mval[2],
float *dist_px, float *dist_px,
float r_loc[3], float r_loc[3],
float r_no[3], float r_no[3],
int *r_index, int *r_index,
struct Object **r_ob, struct Object **r_ob,
float r_obmat[4][4]); float r_obmat[4][4]);
bool ED_transform_snap_object_project_view3d(struct SnapObjectContext *sctx, bool ED_transform_snap_object_project_view3d(struct SnapObjectContext *sctx,
const unsigned short snap_to, const unsigned short snap_to,
const struct SnapObjectParams *params, const struct SnapObjectParams *params,

20
source/blender/editors/transform/transform_snap_object.c
View File

@@ -2821,15 +2821,15 @@ static short transform_snap_context_project_view3d_mixed_impl(
} }
short ED_transform_snap_object_project_view3d_ex(SnapObjectContext *sctx, short ED_transform_snap_object_project_view3d_ex(SnapObjectContext *sctx,
const unsigned short snap_to, const unsigned short snap_to,
const struct SnapObjectParams *params, const struct SnapObjectParams *params,
const float mval[2], const float mval[2],
float *dist_px, float *dist_px,
float r_loc[3], float r_loc[3],
float r_no[3], float r_no[3],
int *r_index, int *r_index,
Object **r_ob, Object **r_ob,
float r_obmat[4][4]) float r_obmat[4][4])
{ {
return transform_snap_context_project_view3d_mixed_impl( 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; 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]) float r_no[3])
{ {
return ED_transform_snap_object_project_view3d_ex( 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;
} }
/** /**