dillongoostudios/goo-engine
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'blender-v4.1-release'

Browse Source
This commit is contained in:
Germano Cavalcante
2024-02-17 10:38:46 -03:00
parent daedb427c5 dd1c12e4d0
commit a0d453ccad
2 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/blender/editors/space_view3d/view3d_cursor_snap.cc
+1 -1
View File
@@ -815,7 +815,7 @@ static void v3d_cursor_snap_update(V3DSnapCursorState *state,
v3d_cursor_snap_calc_incremental(scene, v3d, region, state->prevpoint, co);
}
}
else if (snap_elem == SCE_SNAP_TO_VERTEX) {
else if (snap_elem & SCE_SNAP_TO_VERTEX) {
snap_elem_index[0] = index;
}
else if (snap_elem &
source/blender/editors/transform/transform_snap_object.cc
+7 -6
View File
@@ -1245,9 +1245,10 @@ eSnapMode ED_transform_snap_object_project_view3d_ex(SnapObjectContext *sctx,
eSnapMode retval = SCE_SNAP_TO_NONE;
float ray_depth_max = BVH_RAYCAST_DIST_MAX;
bool use_occlusion_test = params->use_occlusion_test && !XRAY_ENABLED(v3d);
const bool is_allways_occluded = !params->use_occlusion_test;
bool use_occlusion_plane = is_allways_occluded || !XRAY_ENABLED(v3d);
if (use_occlusion_test || (snap_to_flag & SCE_SNAP_TO_FACE)) {
if (use_occlusion_plane || (snap_to_flag & SCE_SNAP_TO_FACE)) {
const RegionView3D *rv3d = static_cast<const RegionView3D *>(region->regiondata);
float3 ray_end;
ED_view3d_win_to_ray_clipped_ex(depsgraph,
@@ -1268,7 +1269,7 @@ eSnapMode ED_transform_snap_object_project_view3d_ex(SnapObjectContext *sctx,
}
else {
snap_to_flag &= ~SCE_SNAP_TO_FACE;
use_occlusion_test = false;
use_occlusion_plane = false;
}
}
}
@@ -1287,7 +1288,7 @@ eSnapMode ED_transform_snap_object_project_view3d_ex(SnapObjectContext *sctx,
prev_co,
dist_px ? square_f(*dist_px) : FLT_MAX,
nullptr,
use_occlusion_test))
use_occlusion_plane))
{
return retval;
}
@@ -1326,7 +1327,7 @@ eSnapMode ED_transform_snap_object_project_view3d_ex(SnapObjectContext *sctx,
}
}
if (use_occlusion_test || (snap_to_flag & SCE_SNAP_TO_FACE)) {
if (use_occlusion_plane || (snap_to_flag & SCE_SNAP_TO_FACE)) {
has_hit = raycastObjects(sctx);
if (has_hit) {
@@ -1360,7 +1361,7 @@ eSnapMode ED_transform_snap_object_project_view3d_ex(SnapObjectContext *sctx,
/* Remove what has already been computed. */
sctx->runtime.snap_to_flag &= ~(SCE_SNAP_TO_FACE | SCE_SNAP_INDIVIDUAL_NEAREST);
if (use_occlusion_test && has_hit &&
if (use_occlusion_plane && has_hit &&
/* By convention we only snap to the original elements of a curve. */
sctx->ret.ob->type != OB_CURVES_LEGACY)
{