diff options
author | Spivak Vladimir (cwolf3d) <cwolf3d@gmail.com> | 2020-01-15 01:05:43 +0300 |
---|---|---|
committer | Spivak Vladimir (cwolf3d) <cwolf3d@gmail.com> | 2020-01-15 01:05:43 +0300 |
commit | 18a8d4900e72c6bddd5375ac89c818ab791664c4 (patch) | |
tree | 39cb07687530ba541b764fc91af9e6e8f76126a0 /add_mesh_extra_objects | |
parent | b8696856ccbb020192758f1628e23254eb5d8849 (diff) |
Addon Mesh Extra Objects: Fixed add object in Edit mode
Diffstat (limited to 'add_mesh_extra_objects')
-rw-r--r-- | add_mesh_extra_objects/add_mesh_honeycomb.py | 2 | ||||
-rw-r--r-- | add_mesh_extra_objects/add_mesh_pyramid.py | 2 | ||||
-rw-r--r-- | add_mesh_extra_objects/add_mesh_round_cube.py | 2 | ||||
-rw-r--r-- | add_mesh_extra_objects/add_mesh_star.py | 2 | ||||
-rw-r--r-- | add_mesh_extra_objects/add_mesh_supertoroid.py | 2 | ||||
-rw-r--r-- | add_mesh_extra_objects/add_mesh_teapot.py | 6 | ||||
-rw-r--r-- | add_mesh_extra_objects/add_mesh_torusknot.py | 2 | ||||
-rw-r--r-- | add_mesh_extra_objects/add_mesh_twisted_torus.py | 2 |
8 files changed, 11 insertions, 9 deletions
diff --git a/add_mesh_extra_objects/add_mesh_honeycomb.py b/add_mesh_extra_objects/add_mesh_honeycomb.py index 18b6bf70..71fe8833 100644 --- a/add_mesh_extra_objects/add_mesh_honeycomb.py +++ b/add_mesh_extra_objects/add_mesh_honeycomb.py @@ -307,7 +307,7 @@ class add_mesh_honeycomb(bpy.types.Operator, object_utils.AddObjectHelper): verts, faces = comb.generate() mesh = bpy.data.meshes.new('HoneyComb') mesh.from_pydata(verts, [], faces) - object_utils.object_data_add(context, mesh, operator=self) + obj = object_utils.object_data_add(context, mesh, operator=self) obj.select_set(True) active_object.select_set(True) bpy.ops.object.join() diff --git a/add_mesh_extra_objects/add_mesh_pyramid.py b/add_mesh_extra_objects/add_mesh_pyramid.py index 65f69b9e..55685ef5 100644 --- a/add_mesh_extra_objects/add_mesh_pyramid.py +++ b/add_mesh_extra_objects/add_mesh_pyramid.py @@ -188,7 +188,7 @@ class AddPyramid(bpy.types.Operator, object_utils.AddObjectHelper): name_active_object = active_object.name bpy.ops.object.mode_set(mode='OBJECT') mesh = pyramid_mesh(self, context) - object_utils.object_data_add(context, mesh, operator=self) + obj = object_utils.object_data_add(context, mesh, operator=self) obj.select_set(True) active_object.select_set(True) bpy.ops.object.join() diff --git a/add_mesh_extra_objects/add_mesh_round_cube.py b/add_mesh_extra_objects/add_mesh_round_cube.py index b59bbf68..8aeef160 100644 --- a/add_mesh_extra_objects/add_mesh_round_cube.py +++ b/add_mesh_extra_objects/add_mesh_round_cube.py @@ -434,7 +434,7 @@ class AddRoundCube(Operator, object_utils.AddObjectHelper): self.size, self.div_type, self.odd_axis_align) mesh = bpy.data.meshes.new('Roundcube') mesh.from_pydata(verts, [], faces) - object_utils.object_data_add(context, mesh, operator=self) + obj = object_utils.object_data_add(context, mesh, operator=self) obj.select_set(True) active_object.select_set(True) bpy.ops.object.join() diff --git a/add_mesh_extra_objects/add_mesh_star.py b/add_mesh_extra_objects/add_mesh_star.py index eb8f5c15..8346a606 100644 --- a/add_mesh_extra_objects/add_mesh_star.py +++ b/add_mesh_extra_objects/add_mesh_star.py @@ -249,7 +249,7 @@ class AddStar(bpy.types.Operator, object_utils.AddObjectHelper): ) mesh = bpy.data.meshes.new('Star') mesh.from_pydata(verts, [], faces) - object_utils.object_data_add(context, mesh, operator=self) + obj = object_utils.object_data_add(context, mesh, operator=self) obj.select_set(True) active_object.select_set(True) bpy.ops.object.join() diff --git a/add_mesh_extra_objects/add_mesh_supertoroid.py b/add_mesh_extra_objects/add_mesh_supertoroid.py index f874627b..691333af 100644 --- a/add_mesh_extra_objects/add_mesh_supertoroid.py +++ b/add_mesh_extra_objects/add_mesh_supertoroid.py @@ -267,7 +267,7 @@ class add_supertoroid(bpy.types.Operator, object_utils.AddObjectHelper): ) mesh = bpy.data.meshes.new('SuperToroid') mesh.from_pydata(verts, [], faces) - object_utils.object_data_add(context, mesh, operator=self) + obj = object_utils.object_data_add(context, mesh, operator=self) obj.select_set(True) active_object.select_set(True) bpy.ops.object.join() diff --git a/add_mesh_extra_objects/add_mesh_teapot.py b/add_mesh_extra_objects/add_mesh_teapot.py index b41a433b..c583bb7a 100644 --- a/add_mesh_extra_objects/add_mesh_teapot.py +++ b/add_mesh_extra_objects/add_mesh_teapot.py @@ -32,13 +32,15 @@ class AddTeapot(bpy.types.Operator): ) def execute(self, context): + cmode = bpy.context.mode verts, faces = make_teapot(self.objecttype, self.resolution) # Actually create the mesh object from this geometry data. obj = create_mesh_object(context, verts, [], faces, "Teapot") - bpy.ops.object.editmode_toggle() + bpy.ops.object.mode_set(mode='EDIT') bpy.ops.mesh.remove_doubles() - bpy.ops.object.editmode_toggle() + if cmode != "EDIT_MESH": + bpy.ops.object.mode_set(mode=cmode) return {'FINISHED'} diff --git a/add_mesh_extra_objects/add_mesh_torusknot.py b/add_mesh_extra_objects/add_mesh_torusknot.py index 7dfe4c0d..cf570433 100644 --- a/add_mesh_extra_objects/add_mesh_torusknot.py +++ b/add_mesh_extra_objects/add_mesh_torusknot.py @@ -170,7 +170,7 @@ class AddTorusKnot(bpy.types.Operator, object_utils.AddObjectHelper): verts, faces = make_knot(self.objecttype, self.resolution) mesh = bpy.data.meshes.new('TorusKnot') mesh.from_pydata(verts, [], faces) - object_utils.object_data_add(context, mesh, operator=self) + obj = object_utils.object_data_add(context, mesh, operator=self) obj.select_set(True) active_object.select_set(True) bpy.ops.object.join() diff --git a/add_mesh_extra_objects/add_mesh_twisted_torus.py b/add_mesh_extra_objects/add_mesh_twisted_torus.py index 2f01536b..10a3f72e 100644 --- a/add_mesh_extra_objects/add_mesh_twisted_torus.py +++ b/add_mesh_extra_objects/add_mesh_twisted_torus.py @@ -281,7 +281,7 @@ class AddTwistedTorus(bpy.types.Operator, object_utils.AddObjectHelper): ) mesh = bpy.data.meshes.new('TwistedTorus') mesh.from_pydata(verts, [], faces) - object_utils.object_data_add(context, mesh, operator=self) + obj = object_utils.object_data_add(context, mesh, operator=self) obj.select_set(True) active_object.select_set(True) bpy.ops.object.join() |