diff options
author | Pablo Vazquez <venomgfx@gmail.com> | 2018-07-10 19:22:16 +0300 |
---|---|---|
committer | Pablo Vazquez <venomgfx@gmail.com> | 2018-07-10 19:22:22 +0300 |
commit | 245d0d6bb71376ce782ec03bb1622309b9f38aab (patch) | |
tree | f8ddd734bd65786468d58149e621d444d56f02e0 | |
parent | debfbdc27941eeadc8c875c35bf8a13519c87bb4 (diff) |
UI: Textures - Move Colors panel below texture-specific panels
-rw-r--r-- | release/scripts/startup/bl_ui/properties_texture.py | 68 |
1 files changed, 34 insertions, 34 deletions
diff --git a/release/scripts/startup/bl_ui/properties_texture.py b/release/scripts/startup/bl_ui/properties_texture.py index 077ecb21d3e..1859b4bf3e8 100644 --- a/release/scripts/startup/bl_ui/properties_texture.py +++ b/release/scripts/startup/bl_ui/properties_texture.py @@ -199,39 +199,6 @@ class TEXTURE_PT_node_mapping(TextureButtonsPanel, Panel): row.prop(mapping, "mapping_z", text="") -class TEXTURE_PT_colors(TextureButtonsPanel, Panel): - bl_label = "Colors" - bl_options = {'DEFAULT_CLOSED'} - COMPAT_ENGINES = {'BLENDER_RENDER', 'BLENDER_EEVEE'} - - @classmethod - def poll(cls, context): - tex = context.texture - return tex and (tex.type != 'NONE' or tex.use_nodes) and (context.engine in cls.COMPAT_ENGINES) - - def draw(self, context): - layout = self.layout - layout.use_property_split = True - - tex = context.texture - - col = layout.column() - sub = col.column(align=True) - sub.prop(tex, "factor_red", text="Multiply R") - sub.prop(tex, "factor_green", text="G") - sub.prop(tex, "factor_blue", text="B") - - col.prop(tex, "intensity") - col.prop(tex, "contrast") - col.prop(tex, "saturation") - - col.prop(tex, "use_clamp", text="Clamp") - col.prop(tex, "use_color_ramp", text="Ramp") - if tex.use_color_ramp: - layout.use_property_split = False - layout.template_color_ramp(tex, "color_ramp", expand=True) - - class TextureTypePanel(TextureButtonsPanel): @classmethod @@ -770,6 +737,39 @@ class TEXTURE_PT_influence(TextureSlotPanel, Panel): col.prop(tex, "use_stencil") +class TEXTURE_PT_colors(TextureButtonsPanel, Panel): + bl_label = "Colors" + bl_options = {'DEFAULT_CLOSED'} + COMPAT_ENGINES = {'BLENDER_RENDER', 'BLENDER_EEVEE'} + + @classmethod + def poll(cls, context): + tex = context.texture + return tex and (tex.type != 'NONE' or tex.use_nodes) and (context.engine in cls.COMPAT_ENGINES) + + def draw(self, context): + layout = self.layout + layout.use_property_split = True + + tex = context.texture + + col = layout.column() + sub = col.column(align=True) + sub.prop(tex, "factor_red", text="Multiply R") + sub.prop(tex, "factor_green", text="G") + sub.prop(tex, "factor_blue", text="B") + + col.prop(tex, "intensity") + col.prop(tex, "contrast") + col.prop(tex, "saturation") + + col.prop(tex, "use_clamp", text="Clamp") + col.prop(tex, "use_color_ramp", text="Ramp") + if tex.use_color_ramp: + layout.use_property_split = False + layout.template_color_ramp(tex, "color_ramp", expand=True) + + class TEXTURE_PT_custom_props(TextureButtonsPanel, PropertyPanel, Panel): COMPAT_ENGINES = {'BLENDER_RENDER', 'BLENDER_EEVEE'} _context_path = "texture" @@ -789,7 +789,6 @@ classes = ( TEXTURE_PT_node_mapping, TEXTURE_PT_mapping, TEXTURE_PT_influence, - TEXTURE_PT_colors, TEXTURE_PT_clouds, TEXTURE_PT_wood, TEXTURE_PT_marble, @@ -803,6 +802,7 @@ classes = ( TEXTURE_PT_musgrave, TEXTURE_PT_voronoi, TEXTURE_PT_distortednoise, + TEXTURE_PT_colors, TEXTURE_PT_custom_props, ) |