diff options
author | Campbell Barton <ideasman42@gmail.com> | 2011-05-02 21:29:30 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2011-05-02 21:29:30 +0400 |
commit | d8eafe14c676d7915623ae2471b51b775c4e03ba (patch) | |
tree | 16e0fb93f0a8ab276109cc8f82d7b7c832ec2a5d /release | |
parent | a9b066a9c637932d7288a1e65972dd93fc681e83 (diff) |
fix [#27148] *Invalid Path* in all "operator presets" dropdowns
Diffstat (limited to 'release')
-rw-r--r-- | release/scripts/modules/bpy/utils.py | 26 | ||||
-rw-r--r-- | release/scripts/startup/bl_operators/presets.py | 10 | ||||
-rw-r--r-- | release/scripts/startup/bl_operators/wm.py | 2 | ||||
-rw-r--r-- | release/scripts/startup/bl_ui/properties_data_modifier.py | 2 | ||||
-rw-r--r-- | release/scripts/startup/bl_ui/properties_texture.py | 4 | ||||
-rw-r--r-- | release/scripts/startup/bl_ui/space_image.py | 2 |
6 files changed, 30 insertions, 16 deletions
diff --git a/release/scripts/modules/bpy/utils.py b/release/scripts/modules/bpy/utils.py index eee98bdca37..96967a8e4be 100644 --- a/release/scripts/modules/bpy/utils.py +++ b/release/scripts/modules/bpy/utils.py @@ -226,21 +226,35 @@ def user_script_path(): return None -def script_paths(subdir=None, user=True): +def script_paths(subdir=None, user_pref=True, all=False): """ - Returns a list of valid script paths from the home directory and user preferences. + Returns a list of valid script paths. - Accepts any number of string arguments which are joined to make a path. + :arg subdir: Optional subdir. + :type subdir: string + :arg user_pref: Include the user preference script path. + :type user_pref: bool + :arg all: Include local, user and system paths rather just the paths blender uses. + :type all: bool + :return: script paths. + :rtype: list """ scripts = list(_scripts) # add user scripts dir - if user: + if user_pref: user_script_path = _bpy.context.user_preferences.filepaths.script_directory else: user_script_path = None - for path in _bpy_script_paths() + (user_script_path, ): + if all: + # all possible paths + base_paths = tuple(_os.path.join(resource_path(res), "scripts") for res in ('LOCAL', 'USER', 'SYSTEM')) + else: + # only paths blender uses + base_paths = _bpy_script_paths() + + for path in base_paths + (user_script_path, ): if path: path = _os.path.normpath(path) if path not in scripts and _os.path.isdir(path): @@ -266,7 +280,7 @@ def preset_paths(subdir): Returns a list of paths for a specific preset. """ dirs = [] - for path in script_paths("presets"): + for path in script_paths("presets", all=True): directory = _os.path.join(path, subdir) if _os.path.isdir(directory): dirs.append(directory) diff --git a/release/scripts/startup/bl_operators/presets.py b/release/scripts/startup/bl_operators/presets.py index aa6a11407af..493c51ad237 100644 --- a/release/scripts/startup/bl_operators/presets.py +++ b/release/scripts/startup/bl_operators/presets.py @@ -48,11 +48,11 @@ class AddPresetBase(): preset_menu_class = getattr(bpy.types, self.preset_menu) if not self.remove_active: - - if not self.name: + name = self.name.strip() + if not name: return {'FINISHED'} - filename = self.as_filename(self.name) + filename = self.as_filename(name) target_path = bpy.utils.user_resource('SCRIPTS', os.path.join("presets", self.preset_subdir), create=True) @@ -118,7 +118,7 @@ class AddPresetBase(): return {'FINISHED'} def check(self, context): - self.name = self.as_filename(self.name) + self.name = self.as_filename(self.name.strip()) def invoke(self, context, event): if not self.remove_active: @@ -327,7 +327,7 @@ class AddPresetOperator(AddPresetBase, bpy.types.Operator): ret = [] for prop_id, prop in operator_rna.properties.items(): if (not prop.is_hidden) and prop_id not in properties_blacklist: - ret.append("op.%s" % prop_id) + ret.append("op.%s" % prop_id) return ret diff --git a/release/scripts/startup/bl_operators/wm.py b/release/scripts/startup/bl_operators/wm.py index d02b2bfbdde..53c8d562297 100644 --- a/release/scripts/startup/bl_operators/wm.py +++ b/release/scripts/startup/bl_operators/wm.py @@ -837,6 +837,7 @@ class WM_OT_properties_add(bpy.types.Operator): item[property] = 1.0 return {'FINISHED'} + class WM_OT_properties_context_change(bpy.types.Operator): "Change the context tab in a Properties Window" bl_idname = "wm.properties_context_change" @@ -846,7 +847,6 @@ class WM_OT_properties_context_change(bpy.types.Operator): def execute(self, context): context.space_data.context = (self.context) - return {'FINISHED'} diff --git a/release/scripts/startup/bl_ui/properties_data_modifier.py b/release/scripts/startup/bl_ui/properties_data_modifier.py index 817ad1d3a76..1fa79a88f43 100644 --- a/release/scripts/startup/bl_ui/properties_data_modifier.py +++ b/release/scripts/startup/bl_ui/properties_data_modifier.py @@ -581,7 +581,7 @@ class DATA_PT_modifiers(ModifierButtonsPanel, bpy.types.Panel): col.prop(md, "use_even_offset") col.prop(md, "use_quality_normals") col.prop(md, "use_rim") - + sub = col.column() sub.label() row = sub.split(align=True, percentage=0.4) diff --git a/release/scripts/startup/bl_ui/properties_texture.py b/release/scripts/startup/bl_ui/properties_texture.py index be46eb5dca6..01890bc3c99 100644 --- a/release/scripts/startup/bl_ui/properties_texture.py +++ b/release/scripts/startup/bl_ui/properties_texture.py @@ -723,9 +723,9 @@ class TEXTURE_PT_pointdensity(TextureButtonsPanel, bpy.types.Panel): col.prop(pd, "falloff_soft") if pd.falloff == "PARTICLE_VELOCITY": col.prop(pd, "falloff_speed_scale") - + col.prop(pd, "use_falloff_curve") - + if pd.use_falloff_curve: col = layout.column() col.label(text="Falloff Curve") diff --git a/release/scripts/startup/bl_ui/space_image.py b/release/scripts/startup/bl_ui/space_image.py index 0bdc239c408..77583b80824 100644 --- a/release/scripts/startup/bl_ui/space_image.py +++ b/release/scripts/startup/bl_ui/space_image.py @@ -370,7 +370,7 @@ class IMAGE_HT_header(bpy.types.Header): layout.prop(toolsettings, "use_uv_select_sync", text="") if toolsettings.use_uv_select_sync: - layout.template_edit_mode_selection() + layout.template_edit_mode_selection() else: layout.prop(toolsettings, "uv_select_mode", text="", expand=True) layout.prop(uvedit, "sticky_select_mode", text="", icon_only=True) |