blender
/
blender
129
398
Fork 572
Code Issues 6.2k Pull Requests 751 Projects 19 Wiki Activity

Cleanup: Use switch statement to test the object type in snap functions.

This commit is contained in:
Germano Cavalcante 2018-05-14 18:43:03 -03:00
parent c3b061278e
commit 04fa65e356
Notes: blender-bot 2023-02-14 11:21:43 +01:00 
Referenced by issue #55075, Add cube interactive tool: Direction sometimes inverted when dragging scale cage
1 changed files with 56 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -690,32 +690,37 @@ static bool raycastObj(
{
bool retval = false;
if (ob->type == OB_MESH) {
if (use_obedit) {
BMEditMesh *em = BKE_editmesh_from_object(ob);
retval = raycastEditMesh(
sctx,
ray_start, ray_dir,
ob, em, obmat, ob_index,
ray_depth, r_loc, r_no, r_index, r_hit_list);
}
else {
retval = raycastMesh(
sctx,
ray_start, ray_dir,
ob, ob->data, obmat, ob_index,
ray_depth, r_loc, r_no, r_index, r_hit_list);
}
switch (ob->type) {
case OB_MESH:
if (use_obedit) {
BMEditMesh *em = BKE_editmesh_from_object(ob);
retval = raycastEditMesh(
sctx,
ray_start, ray_dir,
ob, em, obmat, ob_index,
ray_depth, r_loc, r_no, r_index, r_hit_list);
}
else {
retval = raycastMesh(
sctx,
ray_start, ray_dir,
ob, ob->data, obmat, ob_index,
ray_depth, r_loc, r_no, r_index, r_hit_list);
}
break;
}
if (retval) {
if (r_ob) {
*r_ob = ob;
}
if (r_obmat) {
copy_m4_m4(r_obmat, obmat);
}
return true;
}
return retval;
return false;
}
@ -1767,71 +1772,75 @@ static bool snapEditMesh(
*/
static bool snapObject(
SnapObjectContext *sctx, SnapData *snapdata,
Object *ob, float obmat[4][4],
bool use_obedit,
Object *ob, float obmat[4][4], bool use_obedit,
/* read/write args */
float *ray_depth, float *dist_px,
/* return args */
float r_loc[3], float r_no[3],
Object **r_ob, float r_obmat[4][4])
{
BLI_assert(snapdata->snap_to != SCE_SNAP_MODE_FACE);
bool retval = false;
if (ob->type == OB_MESH) {
BMEditMesh *em;
switch (ob->type) {
case OB_MESH:
if (use_obedit) {
BMEditMesh *em = BKE_editmesh_from_object(ob);
retval = snapEditMesh(
sctx, snapdata, ob, em, obmat,
ray_depth, dist_px,
r_loc, r_no);
}
else {
retval = snapMesh(
sctx, snapdata, ob, ob->data, obmat,
ray_depth, dist_px,
r_loc, r_no);
}
break;
if (use_obedit) {
em = BKE_editmesh_from_object(ob);
retval = snapEditMesh(
sctx, snapdata, ob, em, obmat,
ray_depth, dist_px,
r_loc, r_no);
}
else {
retval = snapMesh(
sctx, snapdata, ob, ob->data, obmat,
ray_depth, dist_px,
r_loc, r_no);
}
}
else if (snapdata->snap_to != SCE_SNAP_MODE_FACE) {
if (ob->type == OB_ARMATURE) {
case OB_ARMATURE:
retval = snapArmature(
snapdata,
ob, ob->data, obmat,
ray_depth, dist_px,
r_loc, r_no);
}
else if (ob->type == OB_CURVE) {
break;
case OB_CURVE:
retval = snapCurve(
snapdata,
ob, obmat, use_obedit,
ray_depth, dist_px,
r_loc, r_no);
}
else if (ob->type == OB_EMPTY) {
break;
case OB_EMPTY:
retval = snapEmpty(
snapdata,
ob, obmat,
snapdata, ob, obmat,
ray_depth, dist_px,
r_loc, r_no);
}
else if (ob->type == OB_CAMERA) {
break;
case OB_CAMERA:
retval = snapCamera(
sctx, snapdata, ob, obmat,
ray_depth, dist_px,
r_loc, r_no);
}
break;
}
if (retval) {
if (r_ob) {
*r_ob = ob;
}
if (r_obmat) {
copy_m4_m4(r_obmat, obmat);
}
return true;
}
return retval;
return false;
}