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>2013-09-13 01:01:27 +0400
committerCampbell Barton <ideasman42@gmail.com>2013-09-13 01:01:27 +0400
commit6895a9f11f0492671b7a243ca0b5730fc66f65e2 (patch)
treecd90de3dfb10d6fe78e7ac428ae6ac9e5aa5aa77
parent4e24e31f8bdba794ef9acb514b9673a606e26828 (diff)
fix [#36713] crash from adding gear from 'extra objects' addon
-rw-r--r--release/scripts/modules/bpy_extras/object_utils.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/release/scripts/modules/bpy_extras/object_utils.py b/release/scripts/modules/bpy_extras/object_utils.py
index 7d8caf449ca..7ce5aff581a 100644
--- a/release/scripts/modules/bpy_extras/object_utils.py
+++ b/release/scripts/modules/bpy_extras/object_utils.py
@@ -170,6 +170,8 @@ def object_data_add(context, obdata, operator=None, use_active_layer=True):
bpy.ops.object.join() # join into the active.
bpy.data.meshes.remove(obdata)
+ # base is freed, set to active object
+ base = scene.object_bases.active
bpy.ops.object.mode_set(mode='EDIT')
else: