archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Activity

Fix T92605: Snapping not aligning to face extension

Browse Source 
Regression indroduced in rB69d6222481b4342dc2a153e62752145aa37ea101
This commit is contained in:
Germano Cavalcante
2021-11-01 11:41:58 -03:00
parent bb3de31f84
commit c0fbbc53e8
2 changed files with 24 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
source/blender/editors/include/ED_transform_snap_object_context.h
View File

@@ -142,18 +142,18 @@ short ED_transform_snap_object_project_view3d_ex(struct SnapObjectContext *sctx,
struct Object **r_ob,
float r_obmat[4][4],
float r_face_nor[3]);
bool ED_transform_snap_object_project_view3d(struct SnapObjectContext *sctx,
struct Depsgraph *depsgraph,
const ARegion *region,
const View3D *v3d,
const unsigned short snap_to,
const struct SnapObjectParams *params,
const float mval[2],
const float prev_co[3],
float *dist_px,
/* return args */
float r_loc[3],
float r_no[3]);
short ED_transform_snap_object_project_view3d(struct SnapObjectContext *sctx,
struct Depsgraph *depsgraph,
const ARegion *region,
const View3D *v3d,
const unsigned short snap_to,
const struct SnapObjectParams *params,
const float mval[2],
const float prev_co[3],
float *dist_px,
/* return args */
float r_loc[3],
float r_no[3]);
bool ED_transform_snap_object_project_all_view3d_ex(SnapObjectContext *sctx,
struct Depsgraph *depsgraph,

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

@@ -3254,17 +3254,17 @@ short ED_transform_snap_object_project_view3d_ex(SnapObjectContext *sctx,
* \param r_no: hit normal (optional).
* \return Snap success
*/
bool ED_transform_snap_object_project_view3d(SnapObjectContext *sctx,
Depsgraph *depsgraph,
const ARegion *region,
const View3D *v3d,
const ushort snap_to,
const struct SnapObjectParams *params,
const float mval[2],
const float prev_co[3],
float *dist_px,
float r_loc[3],
float r_no[3])
short ED_transform_snap_object_project_view3d(SnapObjectContext *sctx,
Depsgraph *depsgraph,
const ARegion *region,
const View3D *v3d,
const ushort snap_to,
const struct SnapObjectParams *params,
const float mval[2],
const float prev_co[3],
float *dist_px,
float r_loc[3],
float r_no[3])
{
return ED_transform_snap_object_project_view3d_ex(sctx,
depsgraph,
@@ -3280,7 +3280,7 @@ bool ED_transform_snap_object_project_view3d(SnapObjectContext *sctx,
NULL,
NULL,
NULL,
NULL) != 0;
NULL);
}
/**