diff options
Diffstat (limited to 'release/scripts/modules')
6 files changed, 8 insertions, 38 deletions
diff --git a/release/scripts/modules/bl_keymap_utils/keymap_from_toolbar.py b/release/scripts/modules/bl_keymap_utils/keymap_from_toolbar.py index 505223872fe..e18cca7fe25 100644 --- a/release/scripts/modules/bl_keymap_utils/keymap_from_toolbar.py +++ b/release/scripts/modules/bl_keymap_utils/keymap_from_toolbar.py @@ -25,6 +25,7 @@ __all__ = ( "generate", ) + def generate(context, space_type, use_fallback_keys=True, use_reset=True): """ Keymap for popup toolbar, currently generated each time. @@ -110,7 +111,6 @@ def generate(context, space_type, use_fallback_keys=True, use_reset=True): del keymap_src del items_all_id - kmi_unique_args = set() def kmi_unique_or_pass(kmi_args): @@ -118,7 +118,6 @@ def generate(context, space_type, use_fallback_keys=True, use_reset=True): kmi_unique_args.add(dict_as_tuple(kmi_args)) return kmi_unique_len != len(kmi_unique_args) - cls = ToolSelectPanelHelper._tool_class_from_space_type(space_type) if use_hack_properties: @@ -405,7 +404,6 @@ def generate(context, space_type, use_fallback_keys=True, use_reset=True): kmi.properties.name = item.idname kmi_unique_args.add(kmi_tuple) - # --------------------- # End Keymap Generation diff --git a/release/scripts/modules/bl_keymap_utils/keymap_hierarchy.py b/release/scripts/modules/bl_keymap_utils/keymap_hierarchy.py index 3b829de405a..52b9f1601d5 100644 --- a/release/scripts/modules/bl_keymap_utils/keymap_hierarchy.py +++ b/release/scripts/modules/bl_keymap_utils/keymap_hierarchy.py @@ -22,6 +22,7 @@ __all__ = ( "generate", ) + def _km_expand_from_toolsystem(space_type, context_mode): def _fn(): from bl_ui.space_toolsystem_common import ToolSelectPanelHelper diff --git a/release/scripts/modules/bpy/utils/__init__.py b/release/scripts/modules/bpy/utils/__init__.py index 4e0220ee1cc..3ff259e0e3e 100644 --- a/release/scripts/modules/bpy/utils/__init__.py +++ b/release/scripts/modules/bpy/utils/__init__.py @@ -847,7 +847,6 @@ def register_tool(tool_cls, *, after=None, separator=False, group=False): # Create a new group tool_converted = (tool_converted,) - tool_def_insert = ( (None, tool_converted) if separator else (tool_converted,) diff --git a/release/scripts/modules/bpy_extras/keyconfig_utils.py b/release/scripts/modules/bpy_extras/keyconfig_utils.py index 8eea2ede425..3d1b087094b 100644 --- a/release/scripts/modules/bpy_extras/keyconfig_utils.py +++ b/release/scripts/modules/bpy_extras/keyconfig_utils.py @@ -51,6 +51,7 @@ def addon_keymap_register(keymap_data): kmap = kconf.keymaps.new(km_name, **km_args) keymap_init_from_data(kmap, km_content["items"], is_modal=km_modal) + def addon_keymap_unregister(keymap_data): """ Unregister a set of keymaps for addons. diff --git a/release/scripts/modules/bpy_extras/node_shader_utils.py b/release/scripts/modules/bpy_extras/node_shader_utils.py index bcb8adff910..5ddb42e49fc 100644 --- a/release/scripts/modules/bpy_extras/node_shader_utils.py +++ b/release/scripts/modules/bpy_extras/node_shader_utils.py @@ -36,12 +36,15 @@ def _set_check(func): return func(self, *args, **kwargs) return wrapper + def rgb_to_rgba(rgb): return list(rgb) + [1.0] + def rgba_to_rgb(rgba): return Color((rgba[0], rgba[1], rgba[2])) + # All clamping value shall follow Blender's defined min/max (check relevant node definition .c file). def values_clamp(val, minv, maxv): if hasattr(val, "__iter__"): @@ -110,7 +113,6 @@ class ShaderWrapper(): self._textures = {} self._grid_locations = set() - def use_nodes_get(self): return self.material.use_nodes @@ -121,7 +123,6 @@ class ShaderWrapper(): use_nodes = property(use_nodes_get, use_nodes_set) - def node_texcoords_get(self): if not self.use_nodes: return None @@ -173,7 +174,6 @@ class PrincipledBSDFWrapper(ShaderWrapper): def __init__(self, material, is_readonly=True, use_nodes=True): super(PrincipledBSDFWrapper, self).__init__(material, is_readonly, use_nodes) - def update(self): super(PrincipledBSDFWrapper, self).update() @@ -234,7 +234,6 @@ class PrincipledBSDFWrapper(ShaderWrapper): # Tex Coords, lazy initialization... self._node_texcoords = ... - def node_normalmap_get(self): if not self.use_nodes or self.node_principled_bsdf is None: return None @@ -263,7 +262,6 @@ class PrincipledBSDFWrapper(ShaderWrapper): node_normalmap = property(node_normalmap_get) - # -------------------------------------------------------------------- # Base Color. @@ -282,7 +280,6 @@ class PrincipledBSDFWrapper(ShaderWrapper): base_color = property(base_color_get, base_color_set) - def base_color_texture_get(self): if not self.use_nodes or self.node_principled_bsdf is None: return None @@ -294,7 +291,6 @@ class PrincipledBSDFWrapper(ShaderWrapper): base_color_texture = property(base_color_texture_get) - # -------------------------------------------------------------------- # Specular. @@ -312,7 +308,6 @@ class PrincipledBSDFWrapper(ShaderWrapper): specular = property(specular_get, specular_set) - def specular_tint_get(self): if not self.use_nodes or self.node_principled_bsdf is None: return 0.0 @@ -326,7 +321,6 @@ class PrincipledBSDFWrapper(ShaderWrapper): specular_tint = property(specular_tint_get, specular_tint_set) - # Will only be used as gray-scale one... def specular_texture_get(self): if not self.use_nodes or self.node_principled_bsdf is None: @@ -341,7 +335,6 @@ class PrincipledBSDFWrapper(ShaderWrapper): specular_texture = property(specular_texture_get) - # -------------------------------------------------------------------- # Roughness (also sort of inverse of specular hardness...). @@ -359,7 +352,6 @@ class PrincipledBSDFWrapper(ShaderWrapper): roughness = property(roughness_get, roughness_set) - # Will only be used as gray-scale one... def roughness_texture_get(self): if not self.use_nodes or self.node_principled_bsdf is None: @@ -373,7 +365,6 @@ class PrincipledBSDFWrapper(ShaderWrapper): roughness_texture = property(roughness_texture_get) - # -------------------------------------------------------------------- # Metallic (a.k.a reflection, mirror). @@ -391,7 +382,6 @@ class PrincipledBSDFWrapper(ShaderWrapper): metallic = property(metallic_get, metallic_set) - # Will only be used as gray-scale one... def metallic_texture_get(self): if not self.use_nodes or self.node_principled_bsdf is None: @@ -405,7 +395,6 @@ class PrincipledBSDFWrapper(ShaderWrapper): metallic_texture = property(metallic_texture_get) - # -------------------------------------------------------------------- # Transparency settings. @@ -422,7 +411,6 @@ class PrincipledBSDFWrapper(ShaderWrapper): ior = property(ior_get, ior_set) - # Will only be used as gray-scale one... def ior_texture_get(self): if not self.use_nodes or self.node_principled_bsdf is None: @@ -436,7 +424,6 @@ class PrincipledBSDFWrapper(ShaderWrapper): ior_texture = property(ior_texture_get) - def transmission_get(self): if not self.use_nodes or self.node_principled_bsdf is None: return 0.0 @@ -450,7 +437,6 @@ class PrincipledBSDFWrapper(ShaderWrapper): transmission = property(transmission_get, transmission_set) - # Will only be used as gray-scale one... def transmission_texture_get(self): if not self.use_nodes or self.node_principled_bsdf is None: @@ -464,7 +450,6 @@ class PrincipledBSDFWrapper(ShaderWrapper): transmission_texture = property(transmission_texture_get) - def alpha_get(self): if not self.use_nodes or self.node_principled_bsdf is None: return 1.0 @@ -478,7 +463,6 @@ class PrincipledBSDFWrapper(ShaderWrapper): alpha = property(alpha_get, alpha_set) - # Will only be used as gray-scale one... def alpha_texture_get(self): if not self.use_nodes or self.node_principled_bsdf is None: @@ -493,7 +477,6 @@ class PrincipledBSDFWrapper(ShaderWrapper): alpha_texture = property(alpha_texture_get) - # -------------------------------------------------------------------- # Emission color. @@ -511,7 +494,6 @@ class PrincipledBSDFWrapper(ShaderWrapper): emission_color = property(emission_color_get, emission_color_set) - def emission_color_texture_get(self): if not self.use_nodes or self.node_principled_bsdf is None: return None @@ -536,7 +518,6 @@ class PrincipledBSDFWrapper(ShaderWrapper): emission_strength = property(emission_strength_get, emission_strength_set) - def emission_strength_texture_get(self): if not self.use_nodes or self.node_principled_bsdf is None: return None @@ -565,7 +546,6 @@ class PrincipledBSDFWrapper(ShaderWrapper): normalmap_strength = property(normalmap_strength_get, normalmap_strength_set) - def normalmap_texture_get(self): if not self.use_nodes or self.node_normalmap is None: return None @@ -578,6 +558,7 @@ class PrincipledBSDFWrapper(ShaderWrapper): normalmap_texture = property(normalmap_texture_get) + class ShaderImageTextureWrapper(): """ Generic 'image texture'-like wrapper, handling image node, some mapping (texture coordinates transformations), @@ -642,7 +623,6 @@ class ShaderImageTextureWrapper(): if from_node.bl_idname == 'ShaderNodeMapping': self._node_mapping = from_node - def copy_from(self, tex): # Avoid generating any node in source texture. is_readonly_back = tex.is_readonly @@ -656,7 +636,6 @@ class ShaderImageTextureWrapper(): tex.is_readonly = is_readonly_back - def copy_mapping_from(self, tex): # Avoid generating any node in source texture. is_readonly_back = tex.is_readonly @@ -685,7 +664,6 @@ class ShaderImageTextureWrapper(): tex.is_readonly = is_readonly_back - # -------------------------------------------------------------------- # Image. @@ -712,7 +690,6 @@ class ShaderImageTextureWrapper(): node_image = property(node_image_get) - def image_get(self): return self.node_image.image if self.node_image is not None else None @@ -730,7 +707,6 @@ class ShaderImageTextureWrapper(): image = property(image_get, image_set) - def projection_get(self): return self.node_image.projection if self.node_image is not None else 'FLAT' @@ -740,7 +716,6 @@ class ShaderImageTextureWrapper(): projection = property(projection_get, projection_set) - def texcoords_get(self): if self.node_image is not None: socket = (self.node_mapping if self.has_mapping_node() else self.node_image).inputs["Vector"] @@ -762,7 +737,6 @@ class ShaderImageTextureWrapper(): texcoords = property(texcoords_get, texcoords_set) - def extension_get(self): return self.node_image.extension if self.node_image is not None else 'REPEAT' @@ -772,7 +746,6 @@ class ShaderImageTextureWrapper(): extension = property(extension_get, extension_set) - # -------------------------------------------------------------------- # Mapping. @@ -813,7 +786,6 @@ class ShaderImageTextureWrapper(): node_mapping = property(node_mapping_get) - def translation_get(self): if self.node_mapping is None: return Vector((0.0, 0.0, 0.0)) @@ -825,7 +797,6 @@ class ShaderImageTextureWrapper(): translation = property(translation_get, translation_set) - def rotation_get(self): if self.node_mapping is None: return Vector((0.0, 0.0, 0.0)) @@ -837,7 +808,6 @@ class ShaderImageTextureWrapper(): rotation = property(rotation_get, rotation_set) - def scale_get(self): if self.node_mapping is None: return Vector((1.0, 1.0, 1.0)) diff --git a/release/scripts/modules/bpy_types.py b/release/scripts/modules/bpy_types.py index 1c31eaa39d0..7c26744ce8c 100644 --- a/release/scripts/modules/bpy_types.py +++ b/release/scripts/modules/bpy_types.py @@ -27,6 +27,7 @@ StructMetaPropGroup = bpy_types.bpy_struct_meta_idprop # Note that methods extended in C are defined in: 'bpy_rna_types_capi.c' + class Context(StructRNA): __slots__ = () |