[Bf-blender-cvs] [6de656b4f2a] blender2.8: transform_snap_object: Do not use occlusion test when X-Ray is enabled.

Germano noreply at git.blender.org
Sat Jun 2 18:15:31 CEST 2018


Commit: 6de656b4f2ac66922d34bedbeb8f857bc878c5ae
Author: Germano
Date:   Sat Jun 2 13:11:51 2018 -0300
Branches: blender2.8
https://developer.blender.org/rB6de656b4f2ac66922d34bedbeb8f857bc878c5ae

transform_snap_object: Do not use occlusion test when X-Ray is enabled.

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

M	source/blender/editors/transform/transform_snap_object.c

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

diff --git a/source/blender/editors/transform/transform_snap_object.c b/source/blender/editors/transform/transform_snap_object.c
index d3092fa18cd..5932a35bf2b 100644
--- a/source/blender/editors/transform/transform_snap_object.c
+++ b/source/blender/editors/transform/transform_snap_object.c
@@ -2467,7 +2467,11 @@ static short transform_snap_context_project_view3d_mixed_impl(
 	const ARegion *ar = sctx->v3d_data.ar;
 	const RegionView3D *rv3d = ar->regiondata;
 
-	if (snap_to_flag & SCE_SNAP_MODE_FACE || params->use_occlusion_test) {
+	bool use_occlusion_test =
+	        params->use_occlusion_test &&
+	        !(sctx->v3d_data.v3d->shading.flag & V3D_SHADING_XRAY);
+
+	if (snap_to_flag & SCE_SNAP_MODE_FACE || use_occlusion_test) {
 		float ray_start[3], ray_normal[3];
 
 		if (!ED_view3d_win_to_ray_ex(



More information about the Bf-blender-cvs mailing list