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

Fix misuse of the `use_occlusion_test` parameter.

This commit is contained in:
Germano Cavalcante 2018-05-21 11:17:19 -03:00
parent f14e4510ac
commit 08ba057eef
3 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
source/blender/editors/curve/editcurve.c
View File

@ -5021,7 +5021,6 @@ static int add_vertex_invoke(bContext *C, wmOperator *op, const wmEvent *event)
&(const struct SnapObjectParams){
.snap_select = (vc.obedit != NULL) ? SNAP_NOT_ACTIVE : SNAP_ALL,
.use_object_edit_cage = false,
.use_occlusion_test = true,
},
mval, NULL,
location, NULL);

6
source/blender/editors/space_view3d/view3d_manipulator_ruler.c
View File

@ -326,7 +326,6 @@ static bool view3d_ruler_item_mousemove(
&(const struct SnapObjectParams){
.snap_select = SNAP_ALL,
.use_object_edit_cage = true,
.use_occlusion_test = true,
},
mval_fl, &dist_px,
co, ray_normal))
@ -348,15 +347,14 @@ static bool view3d_ruler_item_mousemove(
// Scene *scene = CTX_data_scene(C);
View3D *v3d = ruler_info->sa->spacedata.first;
const float mval_fl[2] = {UNPACK2(mval)};
bool use_depth = (v3d->drawtype >= OB_SOLID);
if (ED_transform_snap_object_project_view3d_mixed(
ruler_info->snap_context,
(SCE_SELECT_VERTEX | SCE_SELECT_EDGE) | (use_depth ? SCE_SELECT_FACE : 0),
(SCE_SELECT_VERTEX | SCE_SELECT_EDGE | SCE_SELECT_FACE),
&(const struct SnapObjectParams){
.snap_select = SNAP_ALL,
.use_object_edit_cage = true,
.use_occlusion_test = use_depth,
.use_occlusion_test = true,
},
mval_fl, &dist_px,
co, NULL))

6
source/blender/editors/space_view3d/view3d_ruler.c
View File

@ -767,7 +767,6 @@ static bool view3d_ruler_item_mousemove(
&(const struct SnapObjectParams){
.snap_select = SNAP_ALL,
.use_object_edit_cage = true,
.use_occlusion_test = true,
},
mval_fl, &dist_px,
co, ray_normal))
@ -789,15 +788,14 @@ static bool view3d_ruler_item_mousemove(
// Scene *scene = CTX_data_scene(C);
View3D *v3d = ruler_info->sa->spacedata.first;
const float mval_fl[2] = {UNPACK2(mval)};
bool use_depth = (v3d->drawtype >= OB_SOLID);
if (ED_transform_snap_object_project_view3d_mixed(
ruler_info->snap_context,
(SCE_SELECT_VERTEX | SCE_SELECT_EDGE) | (use_depth ? SCE_SELECT_FACE : 0),
(SCE_SELECT_VERTEX | SCE_SELECT_EDGE | SCE_SELECT_FACE),
&(const struct SnapObjectParams){
.snap_select = SNAP_ALL,
.use_object_edit_cage = true,
.use_occlusion_test = use_depth,
.use_occlusion_test = true,
},
mval_fl, &dist_px,
co, NULL))