[Bf-blender-cvs] [a41f85d3241] blender2.8: Fix error w/ poly-build clearing the edit-object

Campbell Barton noreply at git.blender.org
Wed Oct 24 07:26:56 CEST 2018


Commit: a41f85d3241919b94a9eca38fd7029d32218d524
Author: Campbell Barton
Date:   Wed Oct 24 16:24:01 2018 +1100
Branches: blender2.8
https://developer.blender.org/rBa41f85d3241919b94a9eca38fd7029d32218d524

Fix error w/ poly-build clearing the edit-object

===================================================================

M	source/blender/editors/mesh/editmesh_polybuild.c

===================================================================

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);



More information about the Bf-blender-cvs mailing list