[Bf-blender-cvs] [c0fbbc53e8f] blender-v3.0-release: Fix T92605: Snapping not aligning to face extension
Germano Cavalcante
noreply at git.blender.org
Mon Nov 1 15:57:38 CET 2021
Commit: c0fbbc53e8fe6e58a1d6029754a2e1da1f9acfcc
Author: Germano Cavalcante
Date: Mon Nov 1 11:41:58 2021 -0300
Branches: blender-v3.0-release
https://developer.blender.org/rBc0fbbc53e8fe6e58a1d6029754a2e1da1f9acfcc
Fix T92605: Snapping not aligning to face extension
Regression indroduced in rB69d6222481b4342dc2a153e62752145aa37ea101
===================================================================
M source/blender/editors/include/ED_transform_snap_object_context.h
M source/blender/editors/transform/transform_snap_object.c
===================================================================
diff --git a/source/blender/editors/include/ED_transform_snap_object_context.h b/source/blender/editors/include/ED_transform_snap_object_context.h
index 62d1dfbf0b1..c4da1588117 100644
--- a/source/blender/editors/include/ED_transform_snap_object_context.h
+++ b/source/blender/editors/include/ED_transform_snap_object_context.h
@@ -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,
diff --git a/source/blender/editors/transform/transform_snap_object.c b/source/blender/editors/transform/transform_snap_object.c
index c779fbe4a33..3254d56d795 100644
--- a/source/blender/editors/transform/transform_snap_object.c
+++ b/source/blender/editors/transform/transform_snap_object.c
@@ -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);
}
/**
More information about the Bf-blender-cvs
mailing list