diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2011-11-27 00:58:53 +0400 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2011-11-27 00:58:53 +0400 |
| commit | 804ec83185d88150908fa0afddd15ccfc1f583f8 (patch) | |
| tree | 645751ab5492a724b3d1827c4e90d17a1ce4c800 /release | |
| parent | 29b89cbc7b1af0a7c3943423496c6ea6a2730dac (diff) | |
| parent | 6f1473fb7c6b3bfa30d750482bd1c7ac197f4a92 (diff) | |
Merging r42160 through r42177 from trunk into soc-2011-tomato
Diffstat (limited to 'release')
| -rw-r--r-- | release/scripts/modules/addon_utils.py | 4 | ||||
| -rw-r--r-- | release/scripts/startup/bl_ui/properties_data_mesh.py | 6 |
2 files changed, 6 insertions, 4 deletions
diff --git a/release/scripts/modules/addon_utils.py b/release/scripts/modules/addon_utils.py index de662b47c4d..21f856a1396 100644 --- a/release/scripts/modules/addon_utils.py +++ b/release/scripts/modules/addon_utils.py @@ -235,7 +235,8 @@ def enable(module_name, default_set=True): # reload if the mtime changes mod = sys.modules.get(module_name) - if mod: + # chances of the file _not_ existing are low, but it could be removed + if mod and os.path.exists(mod.__file__): mod.__addon_enabled__ = False mtime_orig = getattr(mod, "__time__", 0) mtime_new = os.path.getmtime(mod.__file__) @@ -252,6 +253,7 @@ def enable(module_name, default_set=True): # Split registering up into 3 steps so we can undo # if it fails par way through. + # 1) try import try: mod = __import__(module_name) diff --git a/release/scripts/startup/bl_ui/properties_data_mesh.py b/release/scripts/startup/bl_ui/properties_data_mesh.py index 4e52aeb03d2..fa59cc0ac53 100644 --- a/release/scripts/startup/bl_ui/properties_data_mesh.py +++ b/release/scripts/startup/bl_ui/properties_data_mesh.py @@ -36,9 +36,9 @@ class MESH_MT_vertex_group_specials(Menu): layout.operator("object.vertex_group_mirror", icon='ARROW_LEFTRIGHT') layout.operator("object.vertex_group_remove", icon='X', text="Delete All").all = True layout.separator() - layout.operator("object.vertex_group_lock", icon='LOCK', text="Lock All").action = 'SELECT' - layout.operator("object.vertex_group_lock", icon='UNLOCK', text="UnLock All").action = 'DESELECT' - layout.operator("object.vertex_group_lock", icon='LOCK', text="Lock Invert All").action = 'INVERT' + layout.operator("object.vertex_group_lock", icon='LOCKED', text="Lock All").action = 'SELECT' + layout.operator("object.vertex_group_lock", icon='UNLOCKED', text="UnLock All").action = 'DESELECT' + layout.operator("object.vertex_group_lock", icon='LOCKED', text="Lock Invert All").action = 'INVERT' class MESH_MT_shape_key_specials(Menu): |