[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [60085] trunk/blender/release/scripts/ modules/bpy_extras/object_utils.py: fix [#36713] crash from adding gear from 'extra objects' addon

[Campbell Barton]

Revision: 60085
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=60085
Author:   campbellbarton
Date:     2013-09-12 21:01:27 +0000 (Thu, 12 Sep 2013)
Log Message:
-----------
fix [#36713] crash from adding gear from 'extra objects' addon

Modified Paths:
--------------
    trunk/blender/release/scripts/modules/bpy_extras/object_utils.py

Modified: trunk/blender/release/scripts/modules/bpy_extras/object_utils.py
===================================================================
--- trunk/blender/release/scripts/modules/bpy_extras/object_utils.py	2013-09-12 20:43:29 UTC (rev 60084)
+++ trunk/blender/release/scripts/modules/bpy_extras/object_utils.py	2013-09-12 21:01:27 UTC (rev 60085)
@@ -170,6 +170,8 @@
 
         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: