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:
authorPhilipp Oeser <info@graphics-engineer.com>2020-11-12 13:39:34 +0300
committerPhilipp Oeser <info@graphics-engineer.com>2020-11-12 13:39:34 +0300
commit0d04bcd566a8ec62591621a908076f417b717b3d (patch)
treea814dca90f772b67aeab3683e961da82f9c77bc9 /source/blender/editors/sculpt_paint/sculpt_face_set.c
parentd706aaa53dc16ff542cad11c55b4c94cc2f52371 (diff)
parent12dd26a2bbb37fc369956d9e2bcd7d851aafafde (diff)
Merge branch 'blender-v2.91-release' into master
Diffstat (limited to 'source/blender/editors/sculpt_paint/sculpt_face_set.c')
-rw-r--r--source/blender/editors/sculpt_paint/sculpt_face_set.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/source/blender/editors/sculpt_paint/sculpt_face_set.c b/source/blender/editors/sculpt_paint/sculpt_face_set.c
index f803bccde43..c05dace380a 100644
--- a/source/blender/editors/sculpt_paint/sculpt_face_set.c
+++ b/source/blender/editors/sculpt_paint/sculpt_face_set.c
@@ -110,7 +110,10 @@ int ED_sculpt_face_sets_active_update_and_get(bContext *C, Object *ob, const flo
}
SculptCursorGeometryInfo gi;
- SCULPT_cursor_geometry_info_update(C, &gi, mval, false);
+ if (!SCULPT_cursor_geometry_info_update(C, &gi, mval, false)) {
+ return SCULPT_FACE_SET_NONE;
+ }
+
return SCULPT_active_face_set_get(ss);
}