diff options
author | Campbell Barton <ideasman42@gmail.com> | 2012-02-19 22:41:30 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2012-02-19 22:41:30 +0400 |
commit | dc68210c7e432cf313721541e639426dd94f2dfb (patch) | |
tree | 4fb676fa675c304d6594264cc9c1417967d15ff5 /release | |
parent | 51488283564273c5e796d5ca3ded47f2726330e8 (diff) | |
parent | d6deca4e9d6bc7faff98644286571c7934324a9d (diff) |
misc changes from trunk (avoid confusion since these were not intentional differences)bmesh
Diffstat (limited to 'release')
-rw-r--r-- | release/scripts/modules/bpy_types.py | 4 | ||||
-rw-r--r-- | release/scripts/startup/bl_ui/space_info.py | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/release/scripts/modules/bpy_types.py b/release/scripts/modules/bpy_types.py index eeb8f375c3d..c5dc07e493a 100644 --- a/release/scripts/modules/bpy_types.py +++ b/release/scripts/modules/bpy_types.py @@ -202,7 +202,7 @@ class _GenericBone: @property def center(self): """The midpoint between the head and the tail.""" - return self.head.lerp(self.tail, 0.5) + return (self.head + self.tail) * 0.5 @property def length(self): @@ -650,7 +650,7 @@ class _GenericUI: draw_funcs = cls._dyn_ui_initialize() try: draw_funcs.remove(draw_func) - except ValueError: + except: pass diff --git a/release/scripts/startup/bl_ui/space_info.py b/release/scripts/startup/bl_ui/space_info.py index a7592ec9375..b6a450e1a02 100644 --- a/release/scripts/startup/bl_ui/space_info.py +++ b/release/scripts/startup/bl_ui/space_info.py @@ -170,8 +170,6 @@ class INFO_MT_file_export(Menu): if hasattr(bpy.types, "WM_OT_collada_export"): self.layout.operator("wm.collada_export", text="COLLADA (.dae)") - self.layout.operator("export_mesh.wavefront", text="Wavefront (.obj), BMesh") - class INFO_MT_file_external_data(Menu): bl_label = "External Data" |