Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormano-wii <germano.costa@ig.com.br>2019-07-06 00:23:06 +0300
committermano-wii <germano.costa@ig.com.br>2019-07-06 00:23:06 +0300
commita7a9c0e50dc9b96d84e1e7cf18d26b3ef5679aa5 (patch)
tree4b485f2a75f8ff993112119ca38b04e334181d50 /source/blender/editors
parent699193713fc003a51d8b0c717856e3543f3a4ee5 (diff)
transform_snap_object: return type of element snapped.
This can be useful for filtering some of the returns.
Diffstat (limited to 'source/blender/editors')
-rw-r--r--source/blender/editors/include/ED_transform_snap_object_context.h2
-rw-r--r--source/blender/editors/space_view3d/view3d_edit.c2
-rw-r--r--source/blender/editors/transform/transform_snap_object.c4
3 files changed, 4 insertions, 4 deletions
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 75564ddd947..dab3bfe4b6d 100644
--- a/source/blender/editors/include/ED_transform_snap_object_context.h
+++ b/source/blender/editors/include/ED_transform_snap_object_context.h
@@ -121,7 +121,7 @@ bool ED_transform_snap_object_project_ray_all(SnapObjectContext *sctx,
bool sort,
struct ListBase *r_hit_list);
-bool ED_transform_snap_object_project_view3d_ex(struct SnapObjectContext *sctx,
+short ED_transform_snap_object_project_view3d_ex(struct SnapObjectContext *sctx,
const unsigned short snap_to,
const struct SnapObjectParams *params,
const float mval[2],
diff --git a/source/blender/editors/space_view3d/view3d_edit.c b/source/blender/editors/space_view3d/view3d_edit.c
index b6eb57a3c81..38cec8add6b 100644
--- a/source/blender/editors/space_view3d/view3d_edit.c
+++ b/source/blender/editors/space_view3d/view3d_edit.c
@@ -4944,7 +4944,7 @@ void ED_view3d_cursor3d_position_rotation(bContext *C,
ray_no,
NULL,
&ob_dummy,
- obmat)) {
+ obmat) != 0) {
if (use_depth) {
copy_v3_v3(cursor_co, ray_co);
}
diff --git a/source/blender/editors/transform/transform_snap_object.c b/source/blender/editors/transform/transform_snap_object.c
index 03c43c8d16d..aa31d1fc987 100644
--- a/source/blender/editors/transform/transform_snap_object.c
+++ b/source/blender/editors/transform/transform_snap_object.c
@@ -2820,7 +2820,7 @@ static short transform_snap_context_project_view3d_mixed_impl(
return 0;
}
-bool ED_transform_snap_object_project_view3d_ex(SnapObjectContext *sctx,
+short ED_transform_snap_object_project_view3d_ex(SnapObjectContext *sctx,
const unsigned short snap_to,
const struct SnapObjectParams *params,
const float mval[2],
@@ -2856,7 +2856,7 @@ bool ED_transform_snap_object_project_view3d(SnapObjectContext *sctx,
float r_no[3])
{
return ED_transform_snap_object_project_view3d_ex(
- sctx, snap_to, params, mval, dist_px, r_loc, r_no, NULL, NULL, NULL);
+ sctx, snap_to, params, mval, dist_px, r_loc, r_no, NULL, NULL, NULL) != 0;
}
/**