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:
authorCampbell Barton <ideasman42@gmail.com>2018-10-24 08:24:01 +0300
committerCampbell Barton <ideasman42@gmail.com>2018-10-24 08:26:33 +0300
commita41f85d3241919b94a9eca38fd7029d32218d524 (patch)
treef5a9b5ab01c61ba152aaacacb845fde47f99bfd6 /source/blender/editors/mesh
parent4b2b8a0c3fdcd190cf91b304239a73e4c4fca80c (diff)
Fix error w/ poly-build clearing the edit-object
Diffstat (limited to 'source/blender/editors/mesh')
-rw-r--r--source/blender/editors/mesh/editmesh_polybuild.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/source/blender/editors/mesh/editmesh_polybuild.c b/source/blender/editors/mesh/editmesh_polybuild.c
index 873351ee761..bf927478187 100644
--- a/source/blender/editors/mesh/editmesh_polybuild.c
+++ b/source/blender/editors/mesh/editmesh_polybuild.c
@@ -292,8 +292,10 @@ static int edbm_polybuild_face_at_cursor_invoke(
EDBM_mesh_normals_update(em);
EDBM_update_generic(em, true, true);
- if (vc.view_layer->basact != basact) {
- ED_object_base_activate(C, basact);
+ if (basact != NULL) {
+ if (vc.view_layer->basact != basact) {
+ ED_object_base_activate(C, basact);
+ }
}
WM_event_add_mousemove(C);