blender
/
blender
129
397
Fork 571
Code Issues 6.2k Pull Requests 749 Projects 19 Wiki Activity

Cleanup: Clang tidy, clang format

This commit is contained in:
Hans Goudey 2021-04-19 13:48:25 -05:00
parent c13b3dd168
commit 68cbf0a2be
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -886,7 +886,8 @@ static bool raycastEditMesh(SnapObjectContext *sctx,
if (treedata->tree == NULL) {
/* Operators only update the editmesh looptris of the original mesh. */
BLI_assert(sod->treedata_editmesh.em == BKE_editmesh_from_object(DEG_get_original_object(ob_eval)));
BLI_assert(sod->treedata_editmesh.em ==
BKE_editmesh_from_object(DEG_get_original_object(ob_eval)));
em = sod->treedata_editmesh.em;
if (sctx->callbacks.edit_mesh.test_face_fn) {
@ -2276,7 +2277,7 @@ static short snapMesh(SnapObjectContext *sctx,
if (me_eval->totvert == 0) {
return 0;
}
else if (me_eval->totedge == 0 && !(snapdata->snap_to_flag & SCE_SNAP_MODE_VERTEX)) {
if (me_eval->totedge == 0 && !(snapdata->snap_to_flag & SCE_SNAP_MODE_VERTEX)) {
return 0;
}
@ -3115,8 +3116,15 @@ static short transform_snap_context_project_view3d_mixed_impl(
new_clipplane[3] += 0.01f;
/* Try to snap only to the polygon. */
elem_test = snap_mesh_polygon(
sctx, &snapdata, ob_eval, obmat, params->use_backface_culling, &dist_px_tmp, loc, no, &index);
elem_test = snap_mesh_polygon(sctx,
&snapdata,
ob_eval,
obmat,
params->use_backface_culling,
&dist_px_tmp,
loc,
no,
&index);
if (elem_test) {
elem = elem_test;
}