Revision: 26512
          
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=26512
Author:   campbellbarton
Date:     2010-02-01 15:25:38 +0100 (Mon, 01 Feb 2010)

Log Message:
-----------
remove workaround thats not needed anymore and could cause a python error when 
linking a mesh with keys to an object.

Modified Paths:
--------------
    trunk/blender/release/scripts/ui/properties_data_mesh.py

Modified: trunk/blender/release/scripts/ui/properties_data_mesh.py
===================================================================
--- trunk/blender/release/scripts/ui/properties_data_mesh.py    2010-02-01 
13:48:13 UTC (rev 26511)
+++ trunk/blender/release/scripts/ui/properties_data_mesh.py    2010-02-01 
14:25:38 UTC (rev 26512)
@@ -155,12 +155,7 @@
 
         ob = context.object
         key = ob.data.shape_keys
-        if key and len(key.keys):
-            # this is so that we get the active shapekey from the
-            # shapekeys block, not from object data
-            kb = key.keys[ob.active_shape_key.name]
-        else:
-            kb = None
+        kb = ob.active_shape_key
         wide_ui = context.region.width > narrowui
 
         enable_edit = ob.mode != 'EDIT'


_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs

Reply via email to