bartvdbraak/blender
1
0
Fork 4
Code Issues 4 Pull Requests 1 Actions 1 Packages Projects Releases Wiki Activity
af72bb50ae
blender/release/scripts/ui/buttons_texture.py

790 lines
21 KiB
Python
Raw Normal View History

2.5 Buttons: * Added initial Texture Buttons by William Reynish. Thanks! Note: I did some code cleanup and fixes to the code. * Texture RNA fixes.
2009-05-22 12:07:03 +00:00
import bpy
UI scripts: * Fix AAO showing Distance property even though it is not supported. * Fix texture buttons not displaying texture stack from the node material. * Small visual tweak to particle mode options.
2009-10-09 15:25:19 +00:00
def active_node_mat(mat):
if mat:
mat_node = mat.active_node_material
if mat_node:
return mat_node
else:
return mat
return None
minor changes to texture ui, not user visible
2009-10-12 14:38:35 +00:00
def context_tex_datablock(context):
idblock = active_node_mat(context.material)
if idblock: return idblock
idblock = context.lamp
if idblock: return idblock
idblock = context.world
if idblock: return idblock
idblock = context.brush
return idblock
UI scripts: * Fix AAO showing Distance property even though it is not supported. * Fix texture buttons not displaying texture stack from the node material. * Small visual tweak to particle mode options.
2009-10-09 15:25:19 +00:00
2.5 Buttons: * Added initial Texture Buttons by William Reynish. Thanks! Note: I did some code cleanup and fixes to the code. * Texture RNA fixes.
2009-05-22 12:07:03 +00:00
class TextureButtonsPanel(bpy.types.Panel):
change blender python interface for classes not to ise __idname__ rather bl_idname since __somename__ is for pythons internal use. replacements... "__idname__" -> "bl_idname" "__props__" -> "bl_props" "__label__" -> "bl_label" "__register__" -> "bl_register" "__undo__" -> "bl_undo" "__space_type__" -> "bl_space_type" "__default_closed__" -> "bl_default_closed" "__region_type__" -> "bl_region_type" "__context__" -> "bl_context" "__show_header__" -> "bl_show_header" "__URL__" -> "_url"
2009-10-31 13:31:23 +00:00
bl_space_type = 'PROPERTIES'
bl_region_type = 'WINDOW'
bl_context = "texture"
2.5 Buttons: * Added initial Texture Buttons by William Reynish. Thanks! Note: I did some code cleanup and fixes to the code. * Texture RNA fixes.
2009-05-22 12:07:03 +00:00
def poll(self, context):
Made texture nodes accessible in the interface. * Exposed Tex.use_nodes, Tex.nodetree, MTex.which_output in RNA * Added node controls to texture buttons (Use Nodes and Use Output) * Made new texture outputs have unique names by default, though unique names still aren't required. Note: The preview window in the texture buttons only takes which_output into account when in "material" mode, and in the material half of "both" mode; the plain texture display ignores the user's output choice. This is because ED_preview_draw draws a Tex* and not an MTex* -- still some work to do here.
2009-08-17 18:37:58 +00:00
tex = context.texture
return (tex and (tex.type != 'NONE' or tex.use_nodes))
2.5 Buttons: * Added more material buttons by William. Thanks. I made some minor adjustments and added Specular Shader Model RNA. * Code cleanup and some consistency tweaks of button files. Notes: Preview render now only shows up when there is an active world, material, texture or lamp. * Made sure initial panels with ID Datablocks are shown, even when no block is active.
2009-06-13 21:22:21 +00:00
UI: * Added panels with dummy preview template. * Added constraints panel for bones next to objects, though it doesn't work that well yet, the operators and code need to be changed so they don't assume it is one or the other in/out of posemode. * Added some graying out in the scene and world buttons.
2009-05-28 23:45:50 +00:00
class TEXTURE_PT_preview(TextureButtonsPanel):
change blender python interface for classes not to ise __idname__ rather bl_idname since __somename__ is for pythons internal use. replacements... "__idname__" -> "bl_idname" "__props__" -> "bl_props" "__label__" -> "bl_label" "__register__" -> "bl_register" "__undo__" -> "bl_undo" "__space_type__" -> "bl_space_type" "__default_closed__" -> "bl_default_closed" "__region_type__" -> "bl_region_type" "__context__" -> "bl_context" "__show_header__" -> "bl_show_header" "__URL__" -> "_url"
2009-10-31 13:31:23 +00:00
bl_label = "Preview"
UI: * Added panels with dummy preview template. * Added constraints panel for bones next to objects, though it doesn't work that well yet, the operators and code need to be changed so they don't assume it is one or the other in/out of posemode. * Added some graying out in the scene and world buttons.
2009-05-28 23:45:50 +00:00
def draw(self, context):
layout = self.layout
2.5 Button Files: * Cleanup of smoke and texture files to match guidelines. * Made "Curve" Panel in Toolbar Closed per default.
2009-08-08 17:21:34 +00:00
UI: * Add Lamp Fallof Curve and Texture Color Ramp panels. * Use button space context data. * A few other minor python layout script updates.
2009-06-03 00:17:35 +00:00
tex = context.texture
Fixed the texture preview to work with multi-output node-based textures.
2009-08-18 19:58:27 +00:00
slot = context.texture_slot
minor changes to texture ui, not user visible
2009-10-12 14:38:35 +00:00
idblock = context_tex_datablock(context)
if idblock:
layout.template_preview(tex, parent=idblock, slot=slot)
2.5: Texture buttons preview now has an option to display the texture, the material, or both side by side.
2009-07-21 01:57:46 +00:00
else:
Fixed the texture preview to work with multi-output node-based textures.
2009-08-18 19:58:27 +00:00
layout.template_preview(tex, slot=slot)
Made texture nodes accessible in the interface. * Exposed Tex.use_nodes, Tex.nodetree, MTex.which_output in RNA * Added node controls to texture buttons (Use Nodes and Use Output) * Made new texture outputs have unique names by default, though unique names still aren't required. Note: The preview window in the texture buttons only takes which_output into account when in "material" mode, and in the material half of "both" mode; the plain texture display ignores the user's output choice. This is because ED_preview_draw draws a Tex* and not an MTex* -- still some work to do here.
2009-08-17 18:37:58 +00:00
patch from William, panel names need to be unique
2009-07-09 09:42:34 +00:00
class TEXTURE_PT_context_texture(TextureButtonsPanel):
improved class validation, variables defined by the rna interface as non-optional could fail silently when absent in the class. Set these to PROP_REGISTER_OPTIONAL and raise an error when others are not found. last commit broke povray too.
2009-10-31 18:48:58 +00:00
bl_label = ""
change blender python interface for classes not to ise __idname__ rather bl_idname since __somename__ is for pythons internal use. replacements... "__idname__" -> "bl_idname" "__props__" -> "bl_props" "__label__" -> "bl_label" "__register__" -> "bl_register" "__undo__" -> "bl_undo" "__space_type__" -> "bl_space_type" "__default_closed__" -> "bl_default_closed" "__region_type__" -> "bl_region_type" "__context__" -> "bl_context" "__show_header__" -> "bl_show_header" "__URL__" -> "_url"
2009-10-31 13:31:23 +00:00
bl_show_header = False
2.5 Buttons: * Added initial Texture Buttons by William Reynish. Thanks! Note: I did some code cleanup and fixes to the code. * Texture RNA fixes.
2009-05-22 12:07:03 +00:00
UI Buttons: * Context now allows pinning a datablock, independent of selection. * Initial ID browse buttons for most buttons tabs. * Browsing from world to texture now displays world textures again, but is a bit of a hack, not sure there is a right way to do this. * There's a button to switch between active materials and textures now, only temporary though. * There's some code to put context part in own region, disabled still because it doesn't work that well yet.
2009-06-07 13:36:12 +00:00
def poll(self, context):
2.5: Painting Various fixes for painting, sculpting and particle edit, still much to be done... * Move RNA paint and sculpt structs into rna_sculpt_paint.c, * Added Particle Edit RNA. * Some tweaks to existing Paint RNA. * Put texture paint and particle edit object in context. * Fix some errors in the brush layout, properly doing None checks, fixing some wrong property identifiers. * Added tool enum for texture paint and particle edit in panels. * Allow editing brush textures in the texture buttons, still with a stupid toggle, ideas for how to make the connection better are welcome.
2009-07-25 22:31:02 +00:00
return (context.material or context.world or context.lamp or context.brush or context.texture)
UI Buttons: * Context now allows pinning a datablock, independent of selection. * Initial ID browse buttons for most buttons tabs. * Browsing from world to texture now displays world textures again, but is a bit of a hack, not sure there is a right way to do this. * There's a button to switch between active materials and textures now, only temporary though. * There's some code to put context part in own region, disabled still because it doesn't work that well yet.
2009-06-07 13:36:12 +00:00
2.5 Buttons: * Added initial Texture Buttons by William Reynish. Thanks! Note: I did some code cleanup and fixes to the code. * Texture RNA fixes.
2009-05-22 12:07:03 +00:00
def draw(self, context):
layout = self.layout
Patch from William "moving the ID browser into its own panel. Eventually these panels should loose their headers to distinguish them from other, normal panels. Also a few other fixes for bones and armature panels."
2009-07-09 09:07:25 +00:00
UI: * Add Lamp Fallof Curve and Texture Color Ramp panels. * Use button space context data. * A few other minor python layout script updates.
2009-06-03 00:17:35 +00:00
tex = context.texture
minor changes to texture ui, not user visible
2009-10-12 14:38:35 +00:00
idblock = context_tex_datablock(context)
pedantic changes to python UI scripts - SOFTBODY -> SOFT_BODY - Use getattr() with enum value to get the modifier function rather then a lot of elif's
2009-08-06 13:15:23 +00:00
UI Buttons: * Context now allows pinning a datablock, independent of selection. * Initial ID browse buttons for most buttons tabs. * Browsing from world to texture now displays world textures again, but is a bit of a hack, not sure there is a right way to do this. * There's a button to switch between active materials and textures now, only temporary though. * There's some code to put context part in own region, disabled still because it doesn't work that well yet.
2009-06-07 13:36:12 +00:00
space = context.space_data
minor changes to texture ui, not user visible
2009-10-12 14:38:35 +00:00
if idblock:
2.5: Buttons Window * Fix poll() callback changes in recent commit, note that these have to work with pinned context too. * Hide header for context panels in py layout. * Don't jump back when collapsing a panel, allow the view to be over some empty space until you scroll back. * Fix follow context icon, order had to be reversed in icon file. * ID template now has icon as part of browse button instead of outside the buttons.
2009-07-09 19:45:27 +00:00
row = layout.row()
*Moved the texture reordering buttons to the side *Use same icons for reordering in constraints, modifiers.
2009-10-12 17:00:38 +00:00
minor changes to texture ui, not user visible
2009-10-12 14:38:35 +00:00
row.template_list(idblock, "textures", idblock, "active_texture_index", rows=2)
Changed texture layers list to display as a proper list. This makes the order clearer, and you can see names. The list always displays its full length though, because texture layers are pre-populated with all 18 texture layers. Would be nice if this was eventually more dynamic, resembling the way you add/remove material indices.
2009-07-31 16:19:26 +00:00
*Moved the texture reordering buttons to the side *Use same icons for reordering in constraints, modifiers.
2009-10-12 17:00:38 +00:00
col = row.column(align=True)
col.item_enumO("texture.slot_move", "type", 'UP', text="", icon='ICON_TRIA_UP')
col.item_enumO("texture.slot_move", "type", 'DOWN', text="", icon='ICON_TRIA_DOWN')
UI Buttons: * Context now allows pinning a datablock, independent of selection. * Initial ID browse buttons for most buttons tabs. * Browsing from world to texture now displays world textures again, but is a bit of a hack, not sure there is a right way to do this. * There's a button to switch between active materials and textures now, only temporary though. * There's some code to put context part in own region, disabled still because it doesn't work that well yet.
2009-06-07 13:36:12 +00:00
split = layout.split(percentage=0.65)
minor changes to texture ui, not user visible
2009-10-12 14:38:35 +00:00
if idblock:
split.template_ID(idblock, "active_texture", new="texture.new")
UI Buttons: * Context now allows pinning a datablock, independent of selection. * Initial ID browse buttons for most buttons tabs. * Browsing from world to texture now displays world textures again, but is a bit of a hack, not sure there is a right way to do this. * There's a button to switch between active materials and textures now, only temporary though. * There's some code to put context part in own region, disabled still because it doesn't work that well yet.
2009-06-07 13:36:12 +00:00
elif tex:
UI: some API functions don't require explicit context passing anymore.
2009-06-23 00:19:10 +00:00
split.template_ID(space, "pin_id")
2.5: Painting Various fixes for painting, sculpting and particle edit, still much to be done... * Move RNA paint and sculpt structs into rna_sculpt_paint.c, * Added Particle Edit RNA. * Some tweaks to existing Paint RNA. * Put texture paint and particle edit object in context. * Fix some errors in the brush layout, properly doing None checks, fixing some wrong property identifiers. * Added tool enum for texture paint and particle edit in panels. * Allow editing brush textures in the texture buttons, still with a stupid toggle, ideas for how to make the connection better are welcome.
2009-07-25 22:31:02 +00:00
Made texture nodes accessible in the interface. * Exposed Tex.use_nodes, Tex.nodetree, MTex.which_output in RNA * Added node controls to texture buttons (Use Nodes and Use Output) * Made new texture outputs have unique names by default, though unique names still aren't required. Note: The preview window in the texture buttons only takes which_output into account when in "material" mode, and in the material half of "both" mode; the plain texture display ignores the user's output choice. This is because ED_preview_draw draws a Tex* and not an MTex* -- still some work to do here.
2009-08-17 18:37:58 +00:00
if (not space.pin_id) and (
context.sculpt_object or
context.vertex_paint_object or
context.weight_paint_object or
context.texture_paint_object
):
2.5: Painting Various fixes for painting, sculpting and particle edit, still much to be done... * Move RNA paint and sculpt structs into rna_sculpt_paint.c, * Added Particle Edit RNA. * Some tweaks to existing Paint RNA. * Put texture paint and particle edit object in context. * Fix some errors in the brush layout, properly doing None checks, fixing some wrong property identifiers. * Added tool enum for texture paint and particle edit in panels. * Allow editing brush textures in the texture buttons, still with a stupid toggle, ideas for how to make the connection better are welcome.
2009-07-25 22:31:02 +00:00
split.itemR(space, "brush_texture", text="Brush", toggle=True)
UI Buttons: * Context now allows pinning a datablock, independent of selection. * Initial ID browse buttons for most buttons tabs. * Browsing from world to texture now displays world textures again, but is a bit of a hack, not sure there is a right way to do this. * There's a button to switch between active materials and textures now, only temporary though. * There's some code to put context part in own region, disabled still because it doesn't work that well yet.
2009-06-07 13:36:12 +00:00
if tex:
Made texture nodes accessible in the interface. * Exposed Tex.use_nodes, Tex.nodetree, MTex.which_output in RNA * Added node controls to texture buttons (Use Nodes and Use Output) * Made new texture outputs have unique names by default, though unique names still aren't required. Note: The preview window in the texture buttons only takes which_output into account when in "material" mode, and in the material half of "both" mode; the plain texture display ignores the user's output choice. This is because ED_preview_draw draws a Tex* and not an MTex* -- still some work to do here.
2009-08-17 18:37:58 +00:00
layout.itemR(tex, "use_nodes")
2.5 Texture Buttons: Some tweaks by William Reynish. Thanks!
2009-06-08 12:01:17 +00:00
split = layout.split(percentage=0.2)
Fix some issues with showing the current textures when using material nodes and texture nodes. Made it all use the same give_current_*_texture functions now.
2009-10-09 09:50:49 +00:00
Made texture nodes accessible in the interface. * Exposed Tex.use_nodes, Tex.nodetree, MTex.which_output in RNA * Added node controls to texture buttons (Use Nodes and Use Output) * Made new texture outputs have unique names by default, though unique names still aren't required. Note: The preview window in the texture buttons only takes which_output into account when in "material" mode, and in the material half of "both" mode; the plain texture display ignores the user's output choice. This is because ED_preview_draw draws a Tex* and not an MTex* -- still some work to do here.
2009-08-17 18:37:58 +00:00
if tex.use_nodes:
slot = context.texture_slot
Fix some issues with showing the current textures when using material nodes and texture nodes. Made it all use the same give_current_*_texture functions now.
2009-10-09 09:50:49 +00:00
if slot:
split.itemL(text="Output:")
split.itemR(slot, "output_node", text="")
Made texture nodes accessible in the interface. * Exposed Tex.use_nodes, Tex.nodetree, MTex.which_output in RNA * Added node controls to texture buttons (Use Nodes and Use Output) * Made new texture outputs have unique names by default, though unique names still aren't required. Note: The preview window in the texture buttons only takes which_output into account when in "material" mode, and in the material half of "both" mode; the plain texture display ignores the user's output choice. This is because ED_preview_draw draws a Tex* and not an MTex* -- still some work to do here.
2009-08-17 18:37:58 +00:00
else:
split.itemL(text="Type:")
split.itemR(tex, "type", text="")
class TEXTURE_PT_colors(TextureButtonsPanel):
change blender python interface for classes not to ise __idname__ rather bl_idname since __somename__ is for pythons internal use. replacements... "__idname__" -> "bl_idname" "__props__" -> "bl_props" "__label__" -> "bl_label" "__register__" -> "bl_register" "__undo__" -> "bl_undo" "__space_type__" -> "bl_space_type" "__default_closed__" -> "bl_default_closed" "__region_type__" -> "bl_region_type" "__context__" -> "bl_context" "__show_header__" -> "bl_show_header" "__URL__" -> "_url"
2009-10-31 13:31:23 +00:00
bl_label = "Colors"
bl_default_closed = True
Made texture nodes accessible in the interface. * Exposed Tex.use_nodes, Tex.nodetree, MTex.which_output in RNA * Added node controls to texture buttons (Use Nodes and Use Output) * Made new texture outputs have unique names by default, though unique names still aren't required. Note: The preview window in the texture buttons only takes which_output into account when in "material" mode, and in the material half of "both" mode; the plain texture display ignores the user's output choice. This is because ED_preview_draw draws a Tex* and not an MTex* -- still some work to do here.
2009-08-17 18:37:58 +00:00
def draw(self, context):
layout = self.layout
tex = context.texture
layout.itemR(tex, "use_color_ramp", text="Ramp")
if tex.use_color_ramp:
UI * Fix problem with curve mapping / color ramps not updating things like previews propertly. Now it uses the RNA update of the pointer from the material/texture/.. so each of those can define their own update, but still share the RNA struct. * Code for these templates is now in interface_templates.c * Fix exception for "axis" property, now it always shows normal widget with the PROP_DIRECTION subtype. * Remove context from uiBlockLayoutResolve, no longer needed.
2009-09-16 18:47:42 +00:00
layout.template_color_ramp(tex, "color_ramp", expand=True)
Made texture nodes accessible in the interface. * Exposed Tex.use_nodes, Tex.nodetree, MTex.which_output in RNA * Added node controls to texture buttons (Use Nodes and Use Output) * Made new texture outputs have unique names by default, though unique names still aren't required. Note: The preview window in the texture buttons only takes which_output into account when in "material" mode, and in the material half of "both" mode; the plain texture display ignores the user's output choice. This is because ED_preview_draw draws a Tex* and not an MTex* -- still some work to do here.
2009-08-17 18:37:58 +00:00
split = layout.split()
Fixed [#19539] Texture > RGB Factor property doesn't appear in the UI
2009-10-05 15:59:12 +00:00
col = split.column()
col.itemL(text="RGB Multiply:")
sub = col.column(align=True)
sub.itemR(tex, "factor_red", text="R")
sub.itemR(tex, "factor_green", text="G")
sub.itemR(tex, "factor_blue", text="B")
2.5 Buttons: * Added initial Texture Buttons by William Reynish. Thanks! Note: I did some code cleanup and fixes to the code. * Texture RNA fixes.
2009-05-22 12:07:03 +00:00
Made texture nodes accessible in the interface. * Exposed Tex.use_nodes, Tex.nodetree, MTex.which_output in RNA * Added node controls to texture buttons (Use Nodes and Use Output) * Made new texture outputs have unique names by default, though unique names still aren't required. Note: The preview window in the texture buttons only takes which_output into account when in "material" mode, and in the material half of "both" mode; the plain texture display ignores the user's output choice. This is because ED_preview_draw draws a Tex* and not an MTex* -- still some work to do here.
2009-08-17 18:37:58 +00:00
col = split.column()
col.itemL(text="Adjust:")
col.itemR(tex, "brightness")
col.itemR(tex, "contrast")
# Texture Slot Panels #
class TextureSlotPanel(TextureButtonsPanel):
def poll(self, context):
return (
context.texture_slot and
TextureButtonsPanel.poll(self, context)
)
class TEXTURE_PT_mapping(TextureSlotPanel):
change blender python interface for classes not to ise __idname__ rather bl_idname since __somename__ is for pythons internal use. replacements... "__idname__" -> "bl_idname" "__props__" -> "bl_props" "__label__" -> "bl_label" "__register__" -> "bl_register" "__undo__" -> "bl_undo" "__space_type__" -> "bl_space_type" "__default_closed__" -> "bl_default_closed" "__region_type__" -> "bl_region_type" "__context__" -> "bl_context" "__show_header__" -> "bl_show_header" "__URL__" -> "_url"
2009-10-31 13:31:23 +00:00
bl_label = "Mapping"
UI scripts: * Close some material/texture panels by default. * Update material buttons to use more diffuse/specular variables. * Don't show texture mapping/influence when the texture is pinned. * Small visual tweak for sequencer header menus.
2009-06-16 01:25:49 +00:00
UI: * Map panel in the Textures tab, patch by William. Note many properties here are not RNA wrapped yet.
2009-06-08 19:44:07 +00:00
def draw(self, context):
layout = self.layout
2.5 Button Files: * Cleanup of smoke and texture files to match guidelines. * Made "Curve" Panel in Toolbar Closed per default.
2009-08-08 17:21:34 +00:00
minor changes to texture ui, not user visible
2009-10-12 14:38:35 +00:00
idblock = context_tex_datablock(context)
UI: * Map panel in the Textures tab, patch by William. Note many properties here are not RNA wrapped yet.
2009-06-08 19:44:07 +00:00
tex = context.texture_slot
2.5: * Wrapped FFMpeg in RNA (some properties are disabled for now). * Some Texture panel tweaks by William. Thanks!
2009-06-10 20:50:23 +00:00
textype = context.texture
UI: * Map panel in the Textures tab, patch by William. Note many properties here are not RNA wrapped yet.
2009-06-08 19:44:07 +00:00
minor changes to texture ui, not user visible
2009-10-12 14:38:35 +00:00
if type(idblock) != bpy.types.Brush:
2.5: Texture Buttons * World and Lamp previews now working here too. * Experiment with list template, showing only icons. Unfortunately texture icon render crashes combined with preview render so it shows all icons the same. * Influence panels updated, with slider for each option. The values are still linked though, will fix that later. * Image texture controls a bit more complete, still WIP. * Color ramp back.
2009-07-21 12:57:55 +00:00
split = layout.split(percentage=0.3)
2.5: Painting Various fixes for painting, sculpting and particle edit, still much to be done... * Move RNA paint and sculpt structs into rna_sculpt_paint.c, * Added Particle Edit RNA. * Some tweaks to existing Paint RNA. * Put texture paint and particle edit object in context. * Fix some errors in the brush layout, properly doing None checks, fixing some wrong property identifiers. * Added tool enum for texture paint and particle edit in panels. * Allow editing brush textures in the texture buttons, still with a stupid toggle, ideas for how to make the connection better are welcome.
2009-07-25 22:31:02 +00:00
col = split.column()
col.itemL(text="Coordinates:")
col = split.column()
col.itemR(tex, "texture_coordinates", text="")
if tex.texture_coordinates == 'ORCO':
"""
ob = context.object
if ob and ob.type == 'MESH':
split = layout.split(percentage=0.3)
split.itemL(text="Mesh:")
split.itemR(ob.data, "texco_mesh", text="")
"""
elif tex.texture_coordinates == 'UV':
split = layout.split(percentage=0.3)
split.itemL(text="Layer:")
Fix #19633: material & texture didn't use autocomplete for selecting uv layers yet.
2009-10-19 11:00:43 +00:00
ob = context.object
if ob and ob.type == 'MESH': split.item_pointerR(tex, "uv_layer", ob.data, "uv_textures", text="")
else: split.itemR(tex, "uv_layer", text="")
2.5: Painting Various fixes for painting, sculpting and particle edit, still much to be done... * Move RNA paint and sculpt structs into rna_sculpt_paint.c, * Added Particle Edit RNA. * Some tweaks to existing Paint RNA. * Put texture paint and particle edit object in context. * Fix some errors in the brush layout, properly doing None checks, fixing some wrong property identifiers. * Added tool enum for texture paint and particle edit in panels. * Allow editing brush textures in the texture buttons, still with a stupid toggle, ideas for how to make the connection better are welcome.
2009-07-25 22:31:02 +00:00
elif tex.texture_coordinates == 'OBJECT':
split = layout.split(percentage=0.3)
split.itemL(text="Object:")
split.itemR(tex, "object", text="")
texture mapping buttons were not visible, (own fault)
2009-10-14 15:28:57 +00:00
if type(idblock) == bpy.types.Brush:
Texture stack influences are now all separate values, and negative mapped values now have their influence negated instead. Also a few RNA changes for TextureSlot. Bumped subversion for the version patch.
2009-10-01 17:15:23 +00:00
layout.itemR(tex, "map_mode", expand=True)
2.5/Sculpt: * Moved the brush texture settings to MTex/TextureSlot. The mapping settings now show up in the texture panel, pretty much like they do for textures used with materials. TODO: * Tiled mode should not show Z size setting * Add a locked mode so that texture size can be changed uniformly like in 2.4x
2009-08-13 20:05:36 +00:00
row = layout.row()
Texture stack influences are now all separate values, and negative mapped values now have their influence negated instead. Also a few RNA changes for TextureSlot. Bumped subversion for the version patch.
2009-10-01 17:15:23 +00:00
row.active = tex.map_mode in ('FIXED', 'TILED')
2.5/Sculpt: * Moved the brush texture settings to MTex/TextureSlot. The mapping settings now show up in the texture panel, pretty much like they do for textures used with materials. TODO: * Tiled mode should not show Z size setting * Add a locked mode so that texture size can be changed uniformly like in 2.4x
2009-08-13 20:05:36 +00:00
row.itemR(tex, "angle")
row = layout.row()
Texture stack influences are now all separate values, and negative mapped values now have their influence negated instead. Also a few RNA changes for TextureSlot. Bumped subversion for the version patch.
2009-10-01 17:15:23 +00:00
row.active = tex.map_mode in ('TILED', '3D')
2.5/Sculpt: * Moved the brush texture settings to MTex/TextureSlot. The mapping settings now show up in the texture panel, pretty much like they do for textures used with materials. TODO: * Tiled mode should not show Z size setting * Add a locked mode so that texture size can be changed uniformly like in 2.4x
2009-08-13 20:05:36 +00:00
row.column().itemR(tex, "size")
else:
texture mapping buttons were not visible, (own fault)
2009-10-14 15:28:57 +00:00
if type(idblock) == bpy.types.Material:
split = layout.split(percentage=0.3)
split.itemL(text="Projection:")
split.itemR(tex, "mapping", text="")
split = layout.split()
col = split.column()
if tex.texture_coordinates in ('ORCO', 'UV'):
col.itemR(tex, "from_dupli")
elif tex.texture_coordinates == 'OBJECT':
col.itemR(tex, "from_original")
else:
col.itemL()
col = split.column()
row = col.row()
row.itemR(tex, "x_mapping", text="")
row.itemR(tex, "y_mapping", text="")
row.itemR(tex, "z_mapping", text="")
# any non brush
2.5/Sculpt: * Moved the brush texture settings to MTex/TextureSlot. The mapping settings now show up in the texture panel, pretty much like they do for textures used with materials. TODO: * Tiled mode should not show Z size setting * Add a locked mode so that texture size can be changed uniformly like in 2.4x
2009-08-13 20:05:36 +00:00
row = layout.row()
row.column().itemR(tex, "offset")
row.column().itemR(tex, "size")
texture mapping buttons were not visible, (own fault)
2009-10-14 15:28:57 +00:00
2.5 Texture RNA: * Wrapped some Mapping properties and added them into the layout.
2009-06-09 16:04:07 +00:00
Made texture nodes accessible in the interface. * Exposed Tex.use_nodes, Tex.nodetree, MTex.which_output in RNA * Added node controls to texture buttons (Use Nodes and Use Output) * Made new texture outputs have unique names by default, though unique names still aren't required. Note: The preview window in the texture buttons only takes which_output into account when in "material" mode, and in the material half of "both" mode; the plain texture display ignores the user's output choice. This is because ED_preview_draw draws a Tex* and not an MTex* -- still some work to do here.
2009-08-17 18:37:58 +00:00
class TEXTURE_PT_influence(TextureSlotPanel):
change blender python interface for classes not to ise __idname__ rather bl_idname since __somename__ is for pythons internal use. replacements... "__idname__" -> "bl_idname" "__props__" -> "bl_props" "__label__" -> "bl_label" "__register__" -> "bl_register" "__undo__" -> "bl_undo" "__space_type__" -> "bl_space_type" "__default_closed__" -> "bl_default_closed" "__region_type__" -> "bl_region_type" "__context__" -> "bl_context" "__show_header__" -> "bl_show_header" "__URL__" -> "_url"
2009-10-31 13:31:23 +00:00
bl_label = "Influence"
- added xmirror to the weightpaint options - made texture_slot return the texture slot for the node texture
2009-10-19 14:03:02 +00:00
def poll(self, context):
Fix for Texture Tab. Influence Panel got shown even when no active slot was selected, raised errors.
2009-10-22 15:33:53 +00:00
return context.texture_slot
- added xmirror to the weightpaint options - made texture_slot return the texture slot for the node texture
2009-10-19 14:03:02 +00:00
UI scripts: * Close some material/texture panels by default. * Update material buttons to use more diffuse/specular variables. * Don't show texture mapping/influence when the texture is pinned. * Small visual tweak for sequencer header menus.
2009-06-16 01:25:49 +00:00
Texture panel tweaks by William.
2009-06-09 16:52:02 +00:00
def draw(self, context):
- added xmirror to the weightpaint options - made texture_slot return the texture slot for the node texture
2009-10-19 14:03:02 +00:00
Texture panel tweaks by William.
2009-06-09 16:52:02 +00:00
layout = self.layout
2.5 Buttons: * Added more material buttons by William. Thanks. I made some minor adjustments and added Specular Shader Model RNA. * Code cleanup and some consistency tweaks of button files. Notes: Preview render now only shows up when there is an active world, material, texture or lamp. * Made sure initial panels with ID Datablocks are shown, even when no block is active.
2009-06-13 21:22:21 +00:00
minor changes to texture ui, not user visible
2009-10-12 14:38:35 +00:00
idblock = context_tex_datablock(context)
Texture panel tweaks by William.
2009-06-09 16:52:02 +00:00
textype = context.texture
tex = context.texture_slot
2.5: Texture Buttons * World and Lamp previews now working here too. * Experiment with list template, showing only icons. Unfortunately texture icon render crashes combined with preview render so it shows all icons the same. * Influence panels updated, with slider for each option. The values are still linked though, will fix that later. * Image texture controls a bit more complete, still WIP. * Color ramp back.
2009-07-21 12:57:55 +00:00
def factor_but(layout, active, toggle, factor, name):
row = layout.row(align=True)
row.itemR(tex, toggle, text="")
sub = row.row()
sub.active = active
sub.itemR(tex, factor, text=name, slider=True)
UI: * Map panel in the Textures tab, patch by William. Note many properties here are not RNA wrapped yet.
2009-06-08 19:44:07 +00:00
minor changes to texture ui, not user visible
2009-10-12 14:38:35 +00:00
if type(idblock) == bpy.types.Material:
if idblock.type in ('SURFACE', 'HALO', 'WIRE'):
volume material * data reorganisation - uses own values now instead of reusing surface material properties (i.e. an individual density value, rather than reusing alpha) Files saved with the old system won't load up the same after this. * improved defaults and ui
2009-08-16 06:10:31 +00:00
split = layout.split()
col = split.column()
col.itemL(text="Diffuse:")
factor_but(col, tex.map_diffuse, "map_diffuse", "diffuse_factor", "Intensity")
factor_but(col, tex.map_colordiff, "map_colordiff", "colordiff_factor", "Color")
factor_but(col, tex.map_alpha, "map_alpha", "alpha_factor", "Alpha")
factor_but(col, tex.map_translucency, "map_translucency", "translucency_factor", "Translucency")
col.itemL(text="Specular:")
factor_but(col, tex.map_specular, "map_specular", "specular_factor", "Intensity")
factor_but(col, tex.map_colorspec, "map_colorspec", "colorspec_factor", "Color")
factor_but(col, tex.map_hardness, "map_hardness", "hardness_factor", "Hardness")
col = split.column()
col.itemL(text="Shading:")
factor_but(col, tex.map_ambient, "map_ambient", "ambient_factor", "Ambient")
factor_but(col, tex.map_emit, "map_emit", "emit_factor", "Emit")
factor_but(col, tex.map_mirror, "map_mirror", "mirror_factor", "Mirror")
factor_but(col, tex.map_raymir, "map_raymir", "raymir_factor", "Ray Mirror")
col.itemL(text="Geometry:")
factor_but(col, tex.map_normal, "map_normal", "normal_factor", "Normal")
factor_but(col, tex.map_warp, "map_warp", "warp_factor", "Warp")
factor_but(col, tex.map_displacement, "map_displacement", "displacement_factor", "Displace")
#sub = col.column()
#sub.active = tex.map_translucency or tex.map_emit or tex.map_alpha or tex.map_raymir or tex.map_hardness or tex.map_ambient or tex.map_specularity or tex.map_reflection or tex.map_mirror
#sub.itemR(tex, "default_value", text="Amount", slider=True)
* ui fix for texture influences
2009-10-13 02:04:08 +00:00
elif idblock.type == 'VOLUME':
volume material * data reorganisation - uses own values now instead of reusing surface material properties (i.e. an individual density value, rather than reusing alpha) Files saved with the old system won't load up the same after this. * improved defaults and ui
2009-08-16 06:10:31 +00:00
split = layout.split()
col = split.column()
factor_but(col, tex.map_density, "map_density", "density_factor", "Density")
factor_but(col, tex.map_emission, "map_emission", "emission_factor", "Emission")
factor_but(col, tex.map_scattering, "map_scattering", "scattering_factor", "Scattering")
Rework of volume shading After code review and experimentation, this commit makes some changes to the way that volumes are shaded. Previously, there were problems with the 'scattering' component, in that it wasn't physically correct - it didn't conserve energy and was just acting as a brightness multiplier. This has been changed to be more correct, so that as the light is scattered out of the volume, there is less remaining to penetrate through. Since this behaviour is very similar to absorption but more useful, absorption has been removed and has been replaced by a 'transmission colour' - controlling the colour of light penetrating through the volume after it has been scattered/absorbed. As well as this, there's now 'reflection', a non-physically correct RGB multiplier for out-scattered light. This is handy for tweaking the overall colour of the volume, without having to worry about wavelength dependent absorption, and its effects on transmitted light. Now at least, even though there is the ability to tweak things non-physically, volume shading is physically based by default, and has a better combination of correctness and ease of use. There's more detailed information and example images here: http://wiki.blender.org/index.php/User:Broken/VolumeRendering Also did some tweaks/optimisation: * Removed shading step size (was a bit annoying, if it comes back, it will be in a different form) * Removed phase function options, now just one asymmetry slider controls the range between back-scattering, isotropic scattering, and forward scattering. (note, more extreme values gives artifacts with light cache, will fix...) * Disabled the extra 'bounce lights' from the preview render for volumes, speeds updates significantly * Enabled voxeldata texture in preview render * Fixed volume shadows (they were too dark, fixed by avoiding using the shadfac/AddAlphaLight stuff) More revisions to come later...
2009-09-29 22:01:32 +00:00
factor_but(col, tex.map_reflection, "map_reflection", "reflection_factor", "Reflection")
volume material * data reorganisation - uses own values now instead of reusing surface material properties (i.e. an individual density value, rather than reusing alpha) Files saved with the old system won't load up the same after this. * improved defaults and ui
2009-08-16 06:10:31 +00:00
col = split.column()
col.itemL(text=" ")
factor_but(col, tex.map_alpha, "map_coloremission", "coloremission_factor", "Emission Color")
Rework of volume shading After code review and experimentation, this commit makes some changes to the way that volumes are shaded. Previously, there were problems with the 'scattering' component, in that it wasn't physically correct - it didn't conserve energy and was just acting as a brightness multiplier. This has been changed to be more correct, so that as the light is scattered out of the volume, there is less remaining to penetrate through. Since this behaviour is very similar to absorption but more useful, absorption has been removed and has been replaced by a 'transmission colour' - controlling the colour of light penetrating through the volume after it has been scattered/absorbed. As well as this, there's now 'reflection', a non-physically correct RGB multiplier for out-scattered light. This is handy for tweaking the overall colour of the volume, without having to worry about wavelength dependent absorption, and its effects on transmitted light. Now at least, even though there is the ability to tweak things non-physically, volume shading is physically based by default, and has a better combination of correctness and ease of use. There's more detailed information and example images here: http://wiki.blender.org/index.php/User:Broken/VolumeRendering Also did some tweaks/optimisation: * Removed shading step size (was a bit annoying, if it comes back, it will be in a different form) * Removed phase function options, now just one asymmetry slider controls the range between back-scattering, isotropic scattering, and forward scattering. (note, more extreme values gives artifacts with light cache, will fix...) * Disabled the extra 'bounce lights' from the preview render for volumes, speeds updates significantly * Enabled voxeldata texture in preview render * Fixed volume shadows (they were too dark, fixed by avoiding using the shadfac/AddAlphaLight stuff) More revisions to come later...
2009-09-29 22:01:32 +00:00
factor_but(col, tex.map_colortransmission, "map_colortransmission", "colortransmission_factor", "Transmission Color")
factor_but(col, tex.map_colorreflection, "map_colorreflection", "colorreflection_factor", "Reflection Color")
2.5: Texture Buttons * World and Lamp previews now working here too. * Experiment with list template, showing only icons. Unfortunately texture icon render crashes combined with preview render so it shows all icons the same. * Influence panels updated, with slider for each option. The values are still linked though, will fix that later. * Image texture controls a bit more complete, still WIP. * Color ramp back.
2009-07-21 12:57:55 +00:00
minor changes to texture ui, not user visible
2009-10-12 14:38:35 +00:00
elif type(idblock) == bpy.types.Lamp:
2.5 * Some changes to make lamp and world textures editing work. You may have to click on another texture slot once before being able to add a texture, and the layout is messy. Added this so lightenv project isn't blocked by this being missing. * Adding a new material slot now doesn't create a new material anymore, to avoid creating unused materials. * Tiny changes to scene/object buttons.
2009-07-15 19:20:59 +00:00
row = layout.row()
2.5: Texture Buttons * World and Lamp previews now working here too. * Experiment with list template, showing only icons. Unfortunately texture icon render crashes combined with preview render so it shows all icons the same. * Influence panels updated, with slider for each option. The values are still linked though, will fix that later. * Image texture controls a bit more complete, still WIP. * Color ramp back.
2009-07-21 12:57:55 +00:00
factor_but(row, tex.map_color, "map_color", "color_factor", "Color")
factor_but(row, tex.map_shadow, "map_shadow", "shadow_factor", "Shadow")
minor changes to texture ui, not user visible
2009-10-12 14:38:35 +00:00
elif type(idblock) == bpy.types.World:
2.5 * Some changes to make lamp and world textures editing work. You may have to click on another texture slot once before being able to add a texture, and the layout is messy. Added this so lightenv project isn't blocked by this being missing. * Adding a new material slot now doesn't create a new material anymore, to avoid creating unused materials. * Tiny changes to scene/object buttons.
2009-07-15 19:20:59 +00:00
split = layout.split()
2.5 Button Files: * Cleanup of smoke and texture files to match guidelines. * Made "Curve" Panel in Toolbar Closed per default.
2009-08-08 17:21:34 +00:00
2.5 * Some changes to make lamp and world textures editing work. You may have to click on another texture slot once before being able to add a texture, and the layout is messy. Added this so lightenv project isn't blocked by this being missing. * Adding a new material slot now doesn't create a new material anymore, to avoid creating unused materials. * Tiny changes to scene/object buttons.
2009-07-15 19:20:59 +00:00
col = split.column()
2.5: Texture Buttons * World and Lamp previews now working here too. * Experiment with list template, showing only icons. Unfortunately texture icon render crashes combined with preview render so it shows all icons the same. * Influence panels updated, with slider for each option. The values are still linked though, will fix that later. * Image texture controls a bit more complete, still WIP. * Color ramp back.
2009-07-21 12:57:55 +00:00
factor_but(col, tex.map_blend, "map_blend", "blend_factor", "Blend")
factor_but(col, tex.map_horizon, "map_horizon", "horizon_factor", "Horizon")
2.5 * Some changes to make lamp and world textures editing work. You may have to click on another texture slot once before being able to add a texture, and the layout is messy. Added this so lightenv project isn't blocked by this being missing. * Adding a new material slot now doesn't create a new material anymore, to avoid creating unused materials. * Tiny changes to scene/object buttons.
2009-07-15 19:20:59 +00:00
col = split.column()
2.5: Texture Buttons * World and Lamp previews now working here too. * Experiment with list template, showing only icons. Unfortunately texture icon render crashes combined with preview render so it shows all icons the same. * Influence panels updated, with slider for each option. The values are still linked though, will fix that later. * Image texture controls a bit more complete, still WIP. * Color ramp back.
2009-07-21 12:57:55 +00:00
factor_but(col, tex.map_zenith_up, "map_zenith_up", "zenith_up_factor", "Zenith Up")
factor_but(col, tex.map_zenith_down, "map_zenith_down", "zenith_down_factor", "Zenith Down")
2.5 * Some changes to make lamp and world textures editing work. You may have to click on another texture slot once before being able to add a texture, and the layout is messy. Added this so lightenv project isn't blocked by this being missing. * Adding a new material slot now doesn't create a new material anymore, to avoid creating unused materials. * Tiny changes to scene/object buttons.
2009-07-15 19:20:59 +00:00
2.5: Texture Buttons * World and Lamp previews now working here too. * Experiment with list template, showing only icons. Unfortunately texture icon render crashes combined with preview render so it shows all icons the same. * Influence panels updated, with slider for each option. The values are still linked though, will fix that later. * Image texture controls a bit more complete, still WIP. * Color ramp back.
2009-07-21 12:57:55 +00:00
layout.itemS()
2.5 Button Files: * Cleanup of smoke and texture files to match guidelines. * Made "Curve" Panel in Toolbar Closed per default.
2009-08-08 17:21:34 +00:00
2.5: Texture Buttons * World and Lamp previews now working here too. * Experiment with list template, showing only icons. Unfortunately texture icon render crashes combined with preview render so it shows all icons the same. * Influence panels updated, with slider for each option. The values are still linked though, will fix that later. * Image texture controls a bit more complete, still WIP. * Color ramp back.
2009-07-21 12:57:55 +00:00
split = layout.split()
2.5 * Some changes to make lamp and world textures editing work. You may have to click on another texture slot once before being able to add a texture, and the layout is messy. Added this so lightenv project isn't blocked by this being missing. * Adding a new material slot now doesn't create a new material anymore, to avoid creating unused materials. * Tiny changes to scene/object buttons.
2009-07-15 19:20:59 +00:00
2.5: Texture Buttons * World and Lamp previews now working here too. * Experiment with list template, showing only icons. Unfortunately texture icon render crashes combined with preview render so it shows all icons the same. * Influence panels updated, with slider for each option. The values are still linked though, will fix that later. * Image texture controls a bit more complete, still WIP. * Color ramp back.
2009-07-21 12:57:55 +00:00
col = split.column()
col.itemR(tex, "blend_type", text="Blend")
col.itemR(tex, "rgb_to_intensity")
2.5 Button Files: * Cleanup of smoke and texture files to match guidelines. * Made "Curve" Panel in Toolbar Closed per default.
2009-08-08 17:21:34 +00:00
sub = col.column()
sub.active = tex.rgb_to_intensity
sub.itemR(tex, "color", text="")
2.5 * Some changes to make lamp and world textures editing work. You may have to click on another texture slot once before being able to add a texture, and the layout is messy. Added this so lightenv project isn't blocked by this being missing. * Adding a new material slot now doesn't create a new material anymore, to avoid creating unused materials. * Tiny changes to scene/object buttons.
2009-07-15 19:20:59 +00:00
2.5: Texture Buttons * World and Lamp previews now working here too. * Experiment with list template, showing only icons. Unfortunately texture icon render crashes combined with preview render so it shows all icons the same. * Influence panels updated, with slider for each option. The values are still linked though, will fix that later. * Image texture controls a bit more complete, still WIP. * Color ramp back.
2009-07-21 12:57:55 +00:00
col = split.column()
col.itemR(tex, "negate", text="Negative")
col.itemR(tex, "stencil")
minor changes to texture ui, not user visible
2009-10-12 14:38:35 +00:00
if type(idblock) in (bpy.types.Material, bpy.types.World):
2.5: Texture Buttons * World and Lamp previews now working here too. * Experiment with list template, showing only icons. Unfortunately texture icon render crashes combined with preview render so it shows all icons the same. * Influence panels updated, with slider for each option. The values are still linked though, will fix that later. * Image texture controls a bit more complete, still WIP. * Color ramp back.
2009-07-21 12:57:55 +00:00
col.itemR(tex, "default_value", text="DVar", slider=True)
UI: * Map panel in the Textures tab, patch by William. Note many properties here are not RNA wrapped yet.
2009-06-08 19:44:07 +00:00
2.5 Button Files: * Cleanup of smoke and texture files to match guidelines. * Made "Curve" Panel in Toolbar Closed per default.
2009-08-08 17:21:34 +00:00
# Texture Type Panels #
UI: * Add Lamp Fallof Curve and Texture Color Ramp panels. * Use button space context data. * A few other minor python layout script updates.
2009-06-03 00:17:35 +00:00
Made texture nodes accessible in the interface. * Exposed Tex.use_nodes, Tex.nodetree, MTex.which_output in RNA * Added node controls to texture buttons (Use Nodes and Use Output) * Made new texture outputs have unique names by default, though unique names still aren't required. Note: The preview window in the texture buttons only takes which_output into account when in "material" mode, and in the material half of "both" mode; the plain texture display ignores the user's output choice. This is because ED_preview_draw draws a Tex* and not an MTex* -- still some work to do here.
2009-08-17 18:37:58 +00:00
class TextureTypePanel(TextureButtonsPanel):
2.5 Buttons: * Added initial Texture Buttons by William Reynish. Thanks! Note: I did some code cleanup and fixes to the code. * Texture RNA fixes.
2009-05-22 12:07:03 +00:00
def poll(self, context):
UI: * Add Lamp Fallof Curve and Texture Color Ramp panels. * Use button space context data. * A few other minor python layout script updates.
2009-06-03 00:17:35 +00:00
tex = context.texture
Made texture nodes accessible in the interface. * Exposed Tex.use_nodes, Tex.nodetree, MTex.which_output in RNA * Added node controls to texture buttons (Use Nodes and Use Output) * Made new texture outputs have unique names by default, though unique names still aren't required. Note: The preview window in the texture buttons only takes which_output into account when in "material" mode, and in the material half of "both" mode; the plain texture display ignores the user's output choice. This is because ED_preview_draw draws a Tex* and not an MTex* -- still some work to do here.
2009-08-17 18:37:58 +00:00
return (tex and tex.type == self.tex_type and not tex.use_nodes)
class TEXTURE_PT_clouds(TextureTypePanel):
change blender python interface for classes not to ise __idname__ rather bl_idname since __somename__ is for pythons internal use. replacements... "__idname__" -> "bl_idname" "__props__" -> "bl_props" "__label__" -> "bl_label" "__register__" -> "bl_register" "__undo__" -> "bl_undo" "__space_type__" -> "bl_space_type" "__default_closed__" -> "bl_default_closed" "__region_type__" -> "bl_region_type" "__context__" -> "bl_context" "__show_header__" -> "bl_show_header" "__URL__" -> "_url"
2009-10-31 13:31:23 +00:00
bl_label = "Clouds"
Made texture nodes accessible in the interface. * Exposed Tex.use_nodes, Tex.nodetree, MTex.which_output in RNA * Added node controls to texture buttons (Use Nodes and Use Output) * Made new texture outputs have unique names by default, though unique names still aren't required. Note: The preview window in the texture buttons only takes which_output into account when in "material" mode, and in the material half of "both" mode; the plain texture display ignores the user's output choice. This is because ED_preview_draw draws a Tex* and not an MTex* -- still some work to do here.
2009-08-17 18:37:58 +00:00
tex_type = 'CLOUDS'
2.5 Buttons: * Added initial Texture Buttons by William Reynish. Thanks! Note: I did some code cleanup and fixes to the code. * Texture RNA fixes.
2009-05-22 12:07:03 +00:00
def draw(self, context):
layout = self.layout
2.5 Button Files: * Cleanup of smoke and texture files to match guidelines. * Made "Curve" Panel in Toolbar Closed per default.
2009-08-08 17:21:34 +00:00
UI: * Add Lamp Fallof Curve and Texture Color Ramp panels. * Use button space context data. * A few other minor python layout script updates.
2009-06-03 00:17:35 +00:00
tex = context.texture
2.5 Buttons: * Added initial Texture Buttons by William Reynish. Thanks! Note: I did some code cleanup and fixes to the code. * Texture RNA fixes.
2009-05-22 12:07:03 +00:00
layout.itemR(tex, "stype", expand=True)
layout.itemL(text="Noise:")
layout.itemR(tex, "noise_type", text="Type", expand=True)
* Small tweaks to texture panels
2009-05-26 02:49:46 +00:00
layout.itemR(tex, "noise_basis", text="Basis")
2.5 Buttons: * Added initial Texture Buttons by William Reynish. Thanks! Note: I did some code cleanup and fixes to the code. * Texture RNA fixes.
2009-05-22 12:07:03 +00:00
2.5 Button Files: * Cleanup of smoke and texture files to match guidelines. * Made "Curve" Panel in Toolbar Closed per default.
2009-08-08 17:21:34 +00:00
flow = layout.column_flow()
flow.itemR(tex, "noise_size", text="Size")
flow.itemR(tex, "noise_depth", text="Depth")
flow.itemR(tex, "nabla", text="Nabla")
2.5 Buttons: * Added initial Texture Buttons by William Reynish. Thanks! Note: I did some code cleanup and fixes to the code. * Texture RNA fixes.
2009-05-22 12:07:03 +00:00
Made texture nodes accessible in the interface. * Exposed Tex.use_nodes, Tex.nodetree, MTex.which_output in RNA * Added node controls to texture buttons (Use Nodes and Use Output) * Made new texture outputs have unique names by default, though unique names still aren't required. Note: The preview window in the texture buttons only takes which_output into account when in "material" mode, and in the material half of "both" mode; the plain texture display ignores the user's output choice. This is because ED_preview_draw draws a Tex* and not an MTex* -- still some work to do here.
2009-08-17 18:37:58 +00:00
class TEXTURE_PT_wood(TextureTypePanel):
change blender python interface for classes not to ise __idname__ rather bl_idname since __somename__ is for pythons internal use. replacements... "__idname__" -> "bl_idname" "__props__" -> "bl_props" "__label__" -> "bl_label" "__register__" -> "bl_register" "__undo__" -> "bl_undo" "__space_type__" -> "bl_space_type" "__default_closed__" -> "bl_default_closed" "__region_type__" -> "bl_region_type" "__context__" -> "bl_context" "__show_header__" -> "bl_show_header" "__URL__" -> "_url"
2009-10-31 13:31:23 +00:00
bl_label = "Wood"
Made texture nodes accessible in the interface. * Exposed Tex.use_nodes, Tex.nodetree, MTex.which_output in RNA * Added node controls to texture buttons (Use Nodes and Use Output) * Made new texture outputs have unique names by default, though unique names still aren't required. Note: The preview window in the texture buttons only takes which_output into account when in "material" mode, and in the material half of "both" mode; the plain texture display ignores the user's output choice. This is because ED_preview_draw draws a Tex* and not an MTex* -- still some work to do here.
2009-08-17 18:37:58 +00:00
tex_type = 'WOOD'
2.5 Buttons: * Added initial Texture Buttons by William Reynish. Thanks! Note: I did some code cleanup and fixes to the code. * Texture RNA fixes.
2009-05-22 12:07:03 +00:00
def draw(self, context):
layout = self.layout
2.5 Button Files: * Cleanup of smoke and texture files to match guidelines. * Made "Curve" Panel in Toolbar Closed per default.
2009-08-08 17:21:34 +00:00
UI: * Add Lamp Fallof Curve and Texture Color Ramp panels. * Use button space context data. * A few other minor python layout script updates.
2009-06-03 00:17:35 +00:00
tex = context.texture
2.5 Buttons: * Added initial Texture Buttons by William Reynish. Thanks! Note: I did some code cleanup and fixes to the code. * Texture RNA fixes.
2009-05-22 12:07:03 +00:00
* Small tweaks to texture panels
2009-05-26 02:49:46 +00:00
layout.itemR(tex, "noisebasis2", expand=True)
2.5 Texture Buttons: Some tweaks by William Reynish. Thanks!
2009-06-08 12:01:17 +00:00
layout.itemR(tex, "stype", expand=True)
col = layout.column()
col.active = tex.stype in ('RINGNOISE', 'BANDNOISE')
col.itemL(text="Noise:")
col.row().itemR(tex, "noise_type", text="Type", expand=True)
col.itemR(tex, "noise_basis", text="Basis")
2.5 Buttons: * Added initial Texture Buttons by William Reynish. Thanks! Note: I did some code cleanup and fixes to the code. * Texture RNA fixes.
2009-05-22 12:07:03 +00:00
2.5 Button Files: * Cleanup of smoke and texture files to match guidelines. * Made "Curve" Panel in Toolbar Closed per default.
2009-08-08 17:21:34 +00:00
flow = layout.column_flow()
flow.active = tex.stype in ('RINGNOISE', 'BANDNOISE')
flow.itemR(tex, "noise_size", text="Size")
flow.itemR(tex, "turbulence")
flow.itemR(tex, "nabla")
2.5 Buttons: * Added initial Texture Buttons by William Reynish. Thanks! Note: I did some code cleanup and fixes to the code. * Texture RNA fixes.
2009-05-22 12:07:03 +00:00
Made texture nodes accessible in the interface. * Exposed Tex.use_nodes, Tex.nodetree, MTex.which_output in RNA * Added node controls to texture buttons (Use Nodes and Use Output) * Made new texture outputs have unique names by default, though unique names still aren't required. Note: The preview window in the texture buttons only takes which_output into account when in "material" mode, and in the material half of "both" mode; the plain texture display ignores the user's output choice. This is because ED_preview_draw draws a Tex* and not an MTex* -- still some work to do here.
2009-08-17 18:37:58 +00:00
class TEXTURE_PT_marble(TextureTypePanel):
change blender python interface for classes not to ise __idname__ rather bl_idname since __somename__ is for pythons internal use. replacements... "__idname__" -> "bl_idname" "__props__" -> "bl_props" "__label__" -> "bl_label" "__register__" -> "bl_register" "__undo__" -> "bl_undo" "__space_type__" -> "bl_space_type" "__default_closed__" -> "bl_default_closed" "__region_type__" -> "bl_region_type" "__context__" -> "bl_context" "__show_header__" -> "bl_show_header" "__URL__" -> "_url"
2009-10-31 13:31:23 +00:00
bl_label = "Marble"
Made texture nodes accessible in the interface. * Exposed Tex.use_nodes, Tex.nodetree, MTex.which_output in RNA * Added node controls to texture buttons (Use Nodes and Use Output) * Made new texture outputs have unique names by default, though unique names still aren't required. Note: The preview window in the texture buttons only takes which_output into account when in "material" mode, and in the material half of "both" mode; the plain texture display ignores the user's output choice. This is because ED_preview_draw draws a Tex* and not an MTex* -- still some work to do here.
2009-08-17 18:37:58 +00:00
tex_type = 'MARBLE'
2.5 Buttons: * Added initial Texture Buttons by William Reynish. Thanks! Note: I did some code cleanup and fixes to the code. * Texture RNA fixes.
2009-05-22 12:07:03 +00:00
def draw(self, context):
layout = self.layout
2.5 Button Files: * Cleanup of smoke and texture files to match guidelines. * Made "Curve" Panel in Toolbar Closed per default.
2009-08-08 17:21:34 +00:00
UI: * Add Lamp Fallof Curve and Texture Color Ramp panels. * Use button space context data. * A few other minor python layout script updates.
2009-06-03 00:17:35 +00:00
tex = context.texture
2.5 Buttons: * Added initial Texture Buttons by William Reynish. Thanks! Note: I did some code cleanup and fixes to the code. * Texture RNA fixes.
2009-05-22 12:07:03 +00:00
layout.itemR(tex, "stype", expand=True)
layout.itemR(tex, "noisebasis2", expand=True)
layout.itemL(text="Noise:")
layout.itemR(tex, "noise_type", text="Type", expand=True)
* Small tweaks to texture panels
2009-05-26 02:49:46 +00:00
layout.itemR(tex, "noise_basis", text="Basis")
2.5 Buttons: * Added initial Texture Buttons by William Reynish. Thanks! Note: I did some code cleanup and fixes to the code. * Texture RNA fixes.
2009-05-22 12:07:03 +00:00
2.5 Button Files: * Cleanup of smoke and texture files to match guidelines. * Made "Curve" Panel in Toolbar Closed per default.
2009-08-08 17:21:34 +00:00
flow = layout.column_flow()
flow.itemR(tex, "noise_size", text="Size")
flow.itemR(tex, "noise_depth", text="Depth")
flow.itemR(tex, "turbulence")
flow.itemR(tex, "nabla")
2.5 Buttons: * Added initial Texture Buttons by William Reynish. Thanks! Note: I did some code cleanup and fixes to the code. * Texture RNA fixes.
2009-05-22 12:07:03 +00:00
Made texture nodes accessible in the interface. * Exposed Tex.use_nodes, Tex.nodetree, MTex.which_output in RNA * Added node controls to texture buttons (Use Nodes and Use Output) * Made new texture outputs have unique names by default, though unique names still aren't required. Note: The preview window in the texture buttons only takes which_output into account when in "material" mode, and in the material half of "both" mode; the plain texture display ignores the user's output choice. This is because ED_preview_draw draws a Tex* and not an MTex* -- still some work to do here.
2009-08-17 18:37:58 +00:00
class TEXTURE_PT_magic(TextureTypePanel):
change blender python interface for classes not to ise __idname__ rather bl_idname since __somename__ is for pythons internal use. replacements... "__idname__" -> "bl_idname" "__props__" -> "bl_props" "__label__" -> "bl_label" "__register__" -> "bl_register" "__undo__" -> "bl_undo" "__space_type__" -> "bl_space_type" "__default_closed__" -> "bl_default_closed" "__region_type__" -> "bl_region_type" "__context__" -> "bl_context" "__show_header__" -> "bl_show_header" "__URL__" -> "_url"
2009-10-31 13:31:23 +00:00
bl_label = "Magic"
Made texture nodes accessible in the interface. * Exposed Tex.use_nodes, Tex.nodetree, MTex.which_output in RNA * Added node controls to texture buttons (Use Nodes and Use Output) * Made new texture outputs have unique names by default, though unique names still aren't required. Note: The preview window in the texture buttons only takes which_output into account when in "material" mode, and in the material half of "both" mode; the plain texture display ignores the user's output choice. This is because ED_preview_draw draws a Tex* and not an MTex* -- still some work to do here.
2009-08-17 18:37:58 +00:00
tex_type = 'MAGIC'
2.5 Buttons: * Added initial Texture Buttons by William Reynish. Thanks! Note: I did some code cleanup and fixes to the code. * Texture RNA fixes.
2009-05-22 12:07:03 +00:00
def draw(self, context):
layout = self.layout
2.5 Button Files: * Cleanup of smoke and texture files to match guidelines. * Made "Curve" Panel in Toolbar Closed per default.
2009-08-08 17:21:34 +00:00
UI: * Add Lamp Fallof Curve and Texture Color Ramp panels. * Use button space context data. * A few other minor python layout script updates.
2009-06-03 00:17:35 +00:00
tex = context.texture
2.5 Buttons: * Added initial Texture Buttons by William Reynish. Thanks! Note: I did some code cleanup and fixes to the code. * Texture RNA fixes.
2009-05-22 12:07:03 +00:00
row = layout.row()
row.itemR(tex, "noise_depth", text="Depth")
row.itemR(tex, "turbulence")
Made texture nodes accessible in the interface. * Exposed Tex.use_nodes, Tex.nodetree, MTex.which_output in RNA * Added node controls to texture buttons (Use Nodes and Use Output) * Made new texture outputs have unique names by default, though unique names still aren't required. Note: The preview window in the texture buttons only takes which_output into account when in "material" mode, and in the material half of "both" mode; the plain texture display ignores the user's output choice. This is because ED_preview_draw draws a Tex* and not an MTex* -- still some work to do here.
2009-08-17 18:37:58 +00:00
class TEXTURE_PT_blend(TextureTypePanel):
change blender python interface for classes not to ise __idname__ rather bl_idname since __somename__ is for pythons internal use. replacements... "__idname__" -> "bl_idname" "__props__" -> "bl_props" "__label__" -> "bl_label" "__register__" -> "bl_register" "__undo__" -> "bl_undo" "__space_type__" -> "bl_space_type" "__default_closed__" -> "bl_default_closed" "__region_type__" -> "bl_region_type" "__context__" -> "bl_context" "__show_header__" -> "bl_show_header" "__URL__" -> "_url"
2009-10-31 13:31:23 +00:00
bl_label = "Blend"
Made texture nodes accessible in the interface. * Exposed Tex.use_nodes, Tex.nodetree, MTex.which_output in RNA * Added node controls to texture buttons (Use Nodes and Use Output) * Made new texture outputs have unique names by default, though unique names still aren't required. Note: The preview window in the texture buttons only takes which_output into account when in "material" mode, and in the material half of "both" mode; the plain texture display ignores the user's output choice. This is because ED_preview_draw draws a Tex* and not an MTex* -- still some work to do here.
2009-08-17 18:37:58 +00:00
tex_type = 'BLEND'
2.5 Buttons: * Added initial Texture Buttons by William Reynish. Thanks! Note: I did some code cleanup and fixes to the code. * Texture RNA fixes.
2009-05-22 12:07:03 +00:00
def draw(self, context):
layout = self.layout
2.5 Button Files: * Cleanup of smoke and texture files to match guidelines. * Made "Curve" Panel in Toolbar Closed per default.
2009-08-08 17:21:34 +00:00
UI: * Add Lamp Fallof Curve and Texture Color Ramp panels. * Use button space context data. * A few other minor python layout script updates.
2009-06-03 00:17:35 +00:00
tex = context.texture
2.5 Buttons: * Added initial Texture Buttons by William Reynish. Thanks! Note: I did some code cleanup and fixes to the code. * Texture RNA fixes.
2009-05-22 12:07:03 +00:00
layout.itemR(tex, "progression")
*Changed texture blend property Flip XY to a proper enum. *Minor adjustments to lamp UI *Fixed issue #19319 (missing notifier)
2009-09-14 13:31:58 +00:00
sub = layout.row()
sub.active = (tex.progression in ('LINEAR', 'QUADRATIC', 'EASING', 'RADIAL'))
sub.itemR(tex, "flip_axis", expand=True)
2.5 Buttons: * Added initial Texture Buttons by William Reynish. Thanks! Note: I did some code cleanup and fixes to the code. * Texture RNA fixes.
2009-05-22 12:07:03 +00:00
Made texture nodes accessible in the interface. * Exposed Tex.use_nodes, Tex.nodetree, MTex.which_output in RNA * Added node controls to texture buttons (Use Nodes and Use Output) * Made new texture outputs have unique names by default, though unique names still aren't required. Note: The preview window in the texture buttons only takes which_output into account when in "material" mode, and in the material half of "both" mode; the plain texture display ignores the user's output choice. This is because ED_preview_draw draws a Tex* and not an MTex* -- still some work to do here.
2009-08-17 18:37:58 +00:00
class TEXTURE_PT_stucci(TextureTypePanel):
change blender python interface for classes not to ise __idname__ rather bl_idname since __somename__ is for pythons internal use. replacements... "__idname__" -> "bl_idname" "__props__" -> "bl_props" "__label__" -> "bl_label" "__register__" -> "bl_register" "__undo__" -> "bl_undo" "__space_type__" -> "bl_space_type" "__default_closed__" -> "bl_default_closed" "__region_type__" -> "bl_region_type" "__context__" -> "bl_context" "__show_header__" -> "bl_show_header" "__URL__" -> "_url"
2009-10-31 13:31:23 +00:00
bl_label = "Stucci"
Made texture nodes accessible in the interface. * Exposed Tex.use_nodes, Tex.nodetree, MTex.which_output in RNA * Added node controls to texture buttons (Use Nodes and Use Output) * Made new texture outputs have unique names by default, though unique names still aren't required. Note: The preview window in the texture buttons only takes which_output into account when in "material" mode, and in the material half of "both" mode; the plain texture display ignores the user's output choice. This is because ED_preview_draw draws a Tex* and not an MTex* -- still some work to do here.
2009-08-17 18:37:58 +00:00
tex_type = 'STUCCI'
2.5 Buttons: * Added initial Texture Buttons by William Reynish. Thanks! Note: I did some code cleanup and fixes to the code. * Texture RNA fixes.
2009-05-22 12:07:03 +00:00
def draw(self, context):
layout = self.layout
2.5 Button Files: * Cleanup of smoke and texture files to match guidelines. * Made "Curve" Panel in Toolbar Closed per default.
2009-08-08 17:21:34 +00:00
UI: * Add Lamp Fallof Curve and Texture Color Ramp panels. * Use button space context data. * A few other minor python layout script updates.
2009-06-03 00:17:35 +00:00
tex = context.texture
2.5 Buttons: * Added initial Texture Buttons by William Reynish. Thanks! Note: I did some code cleanup and fixes to the code. * Texture RNA fixes.
2009-05-22 12:07:03 +00:00
layout.itemR(tex, "stype", expand=True)
layout.itemL(text="Noise:")
layout.itemR(tex, "noise_type", text="Type", expand=True)
* Small tweaks to texture panels
2009-05-26 02:49:46 +00:00
layout.itemR(tex, "noise_basis", text="Basis")
2.5 Buttons: * Added initial Texture Buttons by William Reynish. Thanks! Note: I did some code cleanup and fixes to the code. * Texture RNA fixes.
2009-05-22 12:07:03 +00:00
row = layout.row()
row.itemR(tex, "noise_size", text="Size")
row.itemR(tex, "turbulence")
Made texture nodes accessible in the interface. * Exposed Tex.use_nodes, Tex.nodetree, MTex.which_output in RNA * Added node controls to texture buttons (Use Nodes and Use Output) * Made new texture outputs have unique names by default, though unique names still aren't required. Note: The preview window in the texture buttons only takes which_output into account when in "material" mode, and in the material half of "both" mode; the plain texture display ignores the user's output choice. This is because ED_preview_draw draws a Tex* and not an MTex* -- still some work to do here.
2009-08-17 18:37:58 +00:00
class TEXTURE_PT_image(TextureTypePanel):
change blender python interface for classes not to ise __idname__ rather bl_idname since __somename__ is for pythons internal use. replacements... "__idname__" -> "bl_idname" "__props__" -> "bl_props" "__label__" -> "bl_label" "__register__" -> "bl_register" "__undo__" -> "bl_undo" "__space_type__" -> "bl_space_type" "__default_closed__" -> "bl_default_closed" "__region_type__" -> "bl_region_type" "__context__" -> "bl_context" "__show_header__" -> "bl_show_header" "__URL__" -> "_url"
2009-10-31 13:31:23 +00:00
bl_label = "Image"
Made texture nodes accessible in the interface. * Exposed Tex.use_nodes, Tex.nodetree, MTex.which_output in RNA * Added node controls to texture buttons (Use Nodes and Use Output) * Made new texture outputs have unique names by default, though unique names still aren't required. Note: The preview window in the texture buttons only takes which_output into account when in "material" mode, and in the material half of "both" mode; the plain texture display ignores the user's output choice. This is because ED_preview_draw draws a Tex* and not an MTex* -- still some work to do here.
2009-08-17 18:37:58 +00:00
tex_type = 'IMAGE'
2.5: Texture Buttons * World and Lamp previews now working here too. * Experiment with list template, showing only icons. Unfortunately texture icon render crashes combined with preview render so it shows all icons the same. * Influence panels updated, with slider for each option. The values are still linked though, will fix that later. * Image texture controls a bit more complete, still WIP. * Color ramp back.
2009-07-21 12:57:55 +00:00
def draw(self, context):
layout = self.layout
UI * Fix problem with curve mapping / color ramps not updating things like previews propertly. Now it uses the RNA update of the pointer from the material/texture/.. so each of those can define their own update, but still share the RNA struct. * Code for these templates is now in interface_templates.c * Fix exception for "axis" property, now it always shows normal widget with the PROP_DIRECTION subtype. * Remove context from uiBlockLayoutResolve, no longer needed.
2009-09-16 18:47:42 +00:00
2.5: Texture Buttons * World and Lamp previews now working here too. * Experiment with list template, showing only icons. Unfortunately texture icon render crashes combined with preview render so it shows all icons the same. * Influence panels updated, with slider for each option. The values are still linked though, will fix that later. * Image texture controls a bit more complete, still WIP. * Color ramp back.
2009-07-21 12:57:55 +00:00
tex = context.texture
UI * Fix problem with curve mapping / color ramps not updating things like previews propertly. Now it uses the RNA update of the pointer from the material/texture/.. so each of those can define their own update, but still share the RNA struct. * Code for these templates is now in interface_templates.c * Fix exception for "axis" property, now it always shows normal widget with the PROP_DIRECTION subtype. * Remove context from uiBlockLayoutResolve, no longer needed.
2009-09-16 18:47:42 +00:00
layout.template_image(tex, "image", tex.image_user)
2.5: Texture Buttons * World and Lamp previews now working here too. * Experiment with list template, showing only icons. Unfortunately texture icon render crashes combined with preview render so it shows all icons the same. * Influence panels updated, with slider for each option. The values are still linked though, will fix that later. * Image texture controls a bit more complete, still WIP. * Color ramp back.
2009-07-21 12:57:55 +00:00
Made texture nodes accessible in the interface. * Exposed Tex.use_nodes, Tex.nodetree, MTex.which_output in RNA * Added node controls to texture buttons (Use Nodes and Use Output) * Made new texture outputs have unique names by default, though unique names still aren't required. Note: The preview window in the texture buttons only takes which_output into account when in "material" mode, and in the material half of "both" mode; the plain texture display ignores the user's output choice. This is because ED_preview_draw draws a Tex* and not an MTex* -- still some work to do here.
2009-08-17 18:37:58 +00:00
class TEXTURE_PT_image_sampling(TextureTypePanel):
change blender python interface for classes not to ise __idname__ rather bl_idname since __somename__ is for pythons internal use. replacements... "__idname__" -> "bl_idname" "__props__" -> "bl_props" "__label__" -> "bl_label" "__register__" -> "bl_register" "__undo__" -> "bl_undo" "__space_type__" -> "bl_space_type" "__default_closed__" -> "bl_default_closed" "__region_type__" -> "bl_region_type" "__context__" -> "bl_context" "__show_header__" -> "bl_show_header" "__URL__" -> "_url"
2009-10-31 13:31:23 +00:00
bl_label = "Image Sampling"
bl_default_closed = True
Made texture nodes accessible in the interface. * Exposed Tex.use_nodes, Tex.nodetree, MTex.which_output in RNA * Added node controls to texture buttons (Use Nodes and Use Output) * Made new texture outputs have unique names by default, though unique names still aren't required. Note: The preview window in the texture buttons only takes which_output into account when in "material" mode, and in the material half of "both" mode; the plain texture display ignores the user's output choice. This is because ED_preview_draw draws a Tex* and not an MTex* -- still some work to do here.
2009-08-17 18:37:58 +00:00
tex_type = 'IMAGE'
2.5 Buttons: * Added initial Texture Buttons by William Reynish. Thanks! Note: I did some code cleanup and fixes to the code. * Texture RNA fixes.
2009-05-22 12:07:03 +00:00
def draw(self, context):
layout = self.layout
2.5 Button Files: * Cleanup of smoke and texture files to match guidelines. * Made "Curve" Panel in Toolbar Closed per default.
2009-08-08 17:21:34 +00:00
UI: * Add Lamp Fallof Curve and Texture Color Ramp panels. * Use button space context data. * A few other minor python layout script updates.
2009-06-03 00:17:35 +00:00
tex = context.texture
2.5: Texture Buttons * World and Lamp previews now working here too. * Experiment with list template, showing only icons. Unfortunately texture icon render crashes combined with preview render so it shows all icons the same. * Influence panels updated, with slider for each option. The values are still linked though, will fix that later. * Image texture controls a bit more complete, still WIP. * Color ramp back.
2009-07-21 12:57:55 +00:00
slot = context.texture_slot
2.5 Buttons: * Added initial Texture Buttons by William Reynish. Thanks! Note: I did some code cleanup and fixes to the code. * Texture RNA fixes.
2009-05-22 12:07:03 +00:00
split = layout.split()
2.5: Texture Buttons * World and Lamp previews now working here too. * Experiment with list template, showing only icons. Unfortunately texture icon render crashes combined with preview render so it shows all icons the same. * Influence panels updated, with slider for each option. The values are still linked though, will fix that later. * Image texture controls a bit more complete, still WIP. * Color ramp back.
2009-07-21 12:57:55 +00:00
2.5 Button Files: * Cleanup of smoke and texture files to match guidelines. * Made "Curve" Panel in Toolbar Closed per default.
2009-08-08 17:21:34 +00:00
col = split.column()
col.itemL(text="Alpha:")
col.itemR(tex, "use_alpha", text="Use")
col.itemR(tex, "calculate_alpha", text="Calculate")
col.itemR(tex, "invert_alpha", text="Invert")
2.5: Texture Buttons * World and Lamp previews now working here too. * Experiment with list template, showing only icons. Unfortunately texture icon render crashes combined with preview render so it shows all icons the same. * Influence panels updated, with slider for each option. The values are still linked though, will fix that later. * Image texture controls a bit more complete, still WIP. * Color ramp back.
2009-07-21 12:57:55 +00:00
2.5 Button Files: * Cleanup of smoke and texture files to match guidelines. * Made "Curve" Panel in Toolbar Closed per default.
2009-08-08 17:21:34 +00:00
col.itemL(text="Flip:")
col.itemR(tex, "flip_axis", text="X/Y Axis")
2.5: Texture Buttons * World and Lamp previews now working here too. * Experiment with list template, showing only icons. Unfortunately texture icon render crashes combined with preview render so it shows all icons the same. * Influence panels updated, with slider for each option. The values are still linked though, will fix that later. * Image texture controls a bit more complete, still WIP. * Color ramp back.
2009-07-21 12:57:55 +00:00
2.5 Button Files: * Cleanup of smoke and texture files to match guidelines. * Made "Curve" Panel in Toolbar Closed per default.
2009-08-08 17:21:34 +00:00
col = split.column()
Fixed [#19735] No normal map button in texture->image pane Put it into the "Image Sampling" Panel, not sure if its the right location.
2009-10-29 14:27:56 +00:00
col.itemR(tex, "normal_map")
row = col.row()
row.active = tex.normal_map
row.itemR(tex, "normal_space", text="")
2.5 Button Files: * Cleanup of smoke and texture files to match guidelines. * Made "Curve" Panel in Toolbar Closed per default.
2009-08-08 17:21:34 +00:00
col.itemL(text="Filter:")
col.itemR(tex, "filter", text="")
col.itemR(tex, "mipmap")
row = col.row()
2.5: Texture Buttons * World and Lamp previews now working here too. * Experiment with list template, showing only icons. Unfortunately texture icon render crashes combined with preview render so it shows all icons the same. * Influence panels updated, with slider for each option. The values are still linked though, will fix that later. * Image texture controls a bit more complete, still WIP. * Color ramp back.
2009-07-21 12:57:55 +00:00
row.active = tex.mipmap
2.5 Button Files: * Cleanup of smoke and texture files to match guidelines. * Made "Curve" Panel in Toolbar Closed per default.
2009-08-08 17:21:34 +00:00
row.itemR(tex, "mipmap_gauss", text="Gauss")
col.itemR(tex, "interpolation")
2.5: Texture Buttons * World and Lamp previews now working here too. * Experiment with list template, showing only icons. Unfortunately texture icon render crashes combined with preview render so it shows all icons the same. * Influence panels updated, with slider for each option. The values are still linked though, will fix that later. * Image texture controls a bit more complete, still WIP. * Color ramp back.
2009-07-21 12:57:55 +00:00
if tex.mipmap and tex.filter != 'DEFAULT':
if tex.filter == 'FELINE':
2.5 Button Files: * Cleanup of smoke and texture files to match guidelines. * Made "Curve" Panel in Toolbar Closed per default.
2009-08-08 17:21:34 +00:00
col.itemR(tex, "filter_probes", text="Probes")
2.5: Texture Buttons * World and Lamp previews now working here too. * Experiment with list template, showing only icons. Unfortunately texture icon render crashes combined with preview render so it shows all icons the same. * Influence panels updated, with slider for each option. The values are still linked though, will fix that later. * Image texture controls a bit more complete, still WIP. * Color ramp back.
2009-07-21 12:57:55 +00:00
else:
2.5 Button Files: * Cleanup of smoke and texture files to match guidelines. * Made "Curve" Panel in Toolbar Closed per default.
2009-08-08 17:21:34 +00:00
col.itemR(tex, "filter_eccentricity", text="Eccentricity")
2.5 Buttons: * Added initial Texture Buttons by William Reynish. Thanks! Note: I did some code cleanup and fixes to the code. * Texture RNA fixes.
2009-05-22 12:07:03 +00:00
Made texture nodes accessible in the interface. * Exposed Tex.use_nodes, Tex.nodetree, MTex.which_output in RNA * Added node controls to texture buttons (Use Nodes and Use Output) * Made new texture outputs have unique names by default, though unique names still aren't required. Note: The preview window in the texture buttons only takes which_output into account when in "material" mode, and in the material half of "both" mode; the plain texture display ignores the user's output choice. This is because ED_preview_draw draws a Tex* and not an MTex* -- still some work to do here.
2009-08-17 18:37:58 +00:00
class TEXTURE_PT_image_mapping(TextureTypePanel):
change blender python interface for classes not to ise __idname__ rather bl_idname since __somename__ is for pythons internal use. replacements... "__idname__" -> "bl_idname" "__props__" -> "bl_props" "__label__" -> "bl_label" "__register__" -> "bl_register" "__undo__" -> "bl_undo" "__space_type__" -> "bl_space_type" "__default_closed__" -> "bl_default_closed" "__region_type__" -> "bl_region_type" "__context__" -> "bl_context" "__show_header__" -> "bl_show_header" "__URL__" -> "_url"
2009-10-31 13:31:23 +00:00
bl_label = "Image Mapping"
bl_default_closed = True
Made texture nodes accessible in the interface. * Exposed Tex.use_nodes, Tex.nodetree, MTex.which_output in RNA * Added node controls to texture buttons (Use Nodes and Use Output) * Made new texture outputs have unique names by default, though unique names still aren't required. Note: The preview window in the texture buttons only takes which_output into account when in "material" mode, and in the material half of "both" mode; the plain texture display ignores the user's output choice. This is because ED_preview_draw draws a Tex* and not an MTex* -- still some work to do here.
2009-08-17 18:37:58 +00:00
tex_type = 'IMAGE'
2.5 Buttons: * Added initial Texture Buttons by William Reynish. Thanks! Note: I did some code cleanup and fixes to the code. * Texture RNA fixes.
2009-05-22 12:07:03 +00:00
def draw(self, context):
layout = self.layout
2.5 Button Files: * Cleanup of smoke and texture files to match guidelines. * Made "Curve" Panel in Toolbar Closed per default.
2009-08-08 17:21:34 +00:00
UI: * Add Lamp Fallof Curve and Texture Color Ramp panels. * Use button space context data. * A few other minor python layout script updates.
2009-06-03 00:17:35 +00:00
tex = context.texture
2.5 Buttons: * Added initial Texture Buttons by William Reynish. Thanks! Note: I did some code cleanup and fixes to the code. * Texture RNA fixes.
2009-05-22 12:07:03 +00:00
layout.itemR(tex, "extension")
split = layout.split()
if tex.extension == 'REPEAT':
2.5 Button Files: * Cleanup of smoke and texture files to match guidelines. * Made "Curve" Panel in Toolbar Closed per default.
2009-08-08 17:21:34 +00:00
col = split.column(align=True)
col.itemL(text="Repeat:")
col.itemR(tex, "repeat_x", text="X")
col.itemR(tex, "repeat_y", text="Y")
col = split.column(align=True)
col.itemL(text="Mirror:")
col.itemR(tex, "mirror_x", text="X")
col.itemR(tex, "mirror_y", text="Y")
Fixed [#19735] No normal map button in texture->image pane Put it into the "Image Sampling" Panel, not sure if its the right location.
2009-10-29 14:27:56 +00:00
layout.itemS()
2.5 Buttons: * Added initial Texture Buttons by William Reynish. Thanks! Note: I did some code cleanup and fixes to the code. * Texture RNA fixes.
2009-05-22 12:07:03 +00:00
elif tex.extension == 'CHECKER':
2.5 Button Files: * Cleanup of smoke and texture files to match guidelines. * Made "Curve" Panel in Toolbar Closed per default.
2009-08-08 17:21:34 +00:00
col = split.column(align=True)
row = col.row()
2.5: Texture Buttons * World and Lamp previews now working here too. * Experiment with list template, showing only icons. Unfortunately texture icon render crashes combined with preview render so it shows all icons the same. * Influence panels updated, with slider for each option. The values are still linked though, will fix that later. * Image texture controls a bit more complete, still WIP. * Color ramp back.
2009-07-21 12:57:55 +00:00
row.itemR(tex, "checker_even", text="Even")
row.itemR(tex, "checker_odd", text="Odd")
2.5 Button Files: * Cleanup of smoke and texture files to match guidelines. * Made "Curve" Panel in Toolbar Closed per default.
2009-08-08 17:21:34 +00:00
split.itemR(tex, "checker_distance", text="Distance")
Fixed [#19735] No normal map button in texture->image pane Put it into the "Image Sampling" Panel, not sure if its the right location.
2009-10-29 14:27:56 +00:00
layout.itemS()
2.5: Texture Buttons * World and Lamp previews now working here too. * Experiment with list template, showing only icons. Unfortunately texture icon render crashes combined with preview render so it shows all icons the same. * Influence panels updated, with slider for each option. The values are still linked though, will fix that later. * Image texture controls a bit more complete, still WIP. * Color ramp back.
2009-07-21 12:57:55 +00:00
split = layout.split()
2.5 Button Files: * Cleanup of smoke and texture files to match guidelines. * Made "Curve" Panel in Toolbar Closed per default.
2009-08-08 17:21:34 +00:00
col = split.column(align=True)
#col.itemR(tex, "crop_rectangle")
col.itemL(text="Crop Minimum:")
col.itemR(tex, "crop_min_x", text="X")
col.itemR(tex, "crop_min_y", text="Y")
col = split.column(align=True)
col.itemL(text="Crop Maximum:")
col.itemR(tex, "crop_max_x", text="X")
col.itemR(tex, "crop_max_y", text="Y")
2.5 Buttons: * Added initial Texture Buttons by William Reynish. Thanks! Note: I did some code cleanup and fixes to the code. * Texture RNA fixes.
2009-05-22 12:07:03 +00:00
Made texture nodes accessible in the interface. * Exposed Tex.use_nodes, Tex.nodetree, MTex.which_output in RNA * Added node controls to texture buttons (Use Nodes and Use Output) * Made new texture outputs have unique names by default, though unique names still aren't required. Note: The preview window in the texture buttons only takes which_output into account when in "material" mode, and in the material half of "both" mode; the plain texture display ignores the user's output choice. This is because ED_preview_draw draws a Tex* and not an MTex* -- still some work to do here.
2009-08-17 18:37:58 +00:00
class TEXTURE_PT_plugin(TextureTypePanel):
change blender python interface for classes not to ise __idname__ rather bl_idname since __somename__ is for pythons internal use. replacements... "__idname__" -> "bl_idname" "__props__" -> "bl_props" "__label__" -> "bl_label" "__register__" -> "bl_register" "__undo__" -> "bl_undo" "__space_type__" -> "bl_space_type" "__default_closed__" -> "bl_default_closed" "__region_type__" -> "bl_region_type" "__context__" -> "bl_context" "__show_header__" -> "bl_show_header" "__URL__" -> "_url"
2009-10-31 13:31:23 +00:00
bl_label = "Plugin"
Made texture nodes accessible in the interface. * Exposed Tex.use_nodes, Tex.nodetree, MTex.which_output in RNA * Added node controls to texture buttons (Use Nodes and Use Output) * Made new texture outputs have unique names by default, though unique names still aren't required. Note: The preview window in the texture buttons only takes which_output into account when in "material" mode, and in the material half of "both" mode; the plain texture display ignores the user's output choice. This is because ED_preview_draw draws a Tex* and not an MTex* -- still some work to do here.
2009-08-17 18:37:58 +00:00
tex_type = 'PLUGIN'
2.5 Buttons: * Added initial Texture Buttons by William Reynish. Thanks! Note: I did some code cleanup and fixes to the code. * Texture RNA fixes.
2009-05-22 12:07:03 +00:00
def draw(self, context):
layout = self.layout
2.5 Button Files: * Cleanup of smoke and texture files to match guidelines. * Made "Curve" Panel in Toolbar Closed per default.
2009-08-08 17:21:34 +00:00
UI: * Add Lamp Fallof Curve and Texture Color Ramp panels. * Use button space context data. * A few other minor python layout script updates.
2009-06-03 00:17:35 +00:00
tex = context.texture
2.5 Buttons: * Added initial Texture Buttons by William Reynish. Thanks! Note: I did some code cleanup and fixes to the code. * Texture RNA fixes.
2009-05-22 12:07:03 +00:00
layout.itemL(text="Nothing yet")
Made texture nodes accessible in the interface. * Exposed Tex.use_nodes, Tex.nodetree, MTex.which_output in RNA * Added node controls to texture buttons (Use Nodes and Use Output) * Made new texture outputs have unique names by default, though unique names still aren't required. Note: The preview window in the texture buttons only takes which_output into account when in "material" mode, and in the material half of "both" mode; the plain texture display ignores the user's output choice. This is because ED_preview_draw draws a Tex* and not an MTex* -- still some work to do here.
2009-08-17 18:37:58 +00:00
class TEXTURE_PT_envmap(TextureTypePanel):
change blender python interface for classes not to ise __idname__ rather bl_idname since __somename__ is for pythons internal use. replacements... "__idname__" -> "bl_idname" "__props__" -> "bl_props" "__label__" -> "bl_label" "__register__" -> "bl_register" "__undo__" -> "bl_undo" "__space_type__" -> "bl_space_type" "__default_closed__" -> "bl_default_closed" "__region_type__" -> "bl_region_type" "__context__" -> "bl_context" "__show_header__" -> "bl_show_header" "__URL__" -> "_url"
2009-10-31 13:31:23 +00:00
bl_label = "Environment Map"
Made texture nodes accessible in the interface. * Exposed Tex.use_nodes, Tex.nodetree, MTex.which_output in RNA * Added node controls to texture buttons (Use Nodes and Use Output) * Made new texture outputs have unique names by default, though unique names still aren't required. Note: The preview window in the texture buttons only takes which_output into account when in "material" mode, and in the material half of "both" mode; the plain texture display ignores the user's output choice. This is because ED_preview_draw draws a Tex* and not an MTex* -- still some work to do here.
2009-08-17 18:37:58 +00:00
tex_type = 'ENVIRONMENT_MAP'
2.5 Buttons: * Added initial Texture Buttons by William Reynish. Thanks! Note: I did some code cleanup and fixes to the code. * Texture RNA fixes.
2009-05-22 12:07:03 +00:00
def draw(self, context):
layout = self.layout
2.5 Button Files: * Cleanup of smoke and texture files to match guidelines. * Made "Curve" Panel in Toolbar Closed per default.
2009-08-08 17:21:34 +00:00
UI: * Add Lamp Fallof Curve and Texture Color Ramp panels. * Use button space context data. * A few other minor python layout script updates.
2009-06-03 00:17:35 +00:00
tex = context.texture
2.5 Buttons: * Added initial Texture Buttons by William Reynish. Thanks! Note: I did some code cleanup and fixes to the code. * Texture RNA fixes.
2009-05-22 12:07:03 +00:00
layout.itemL(text="Nothing yet")
Made texture nodes accessible in the interface. * Exposed Tex.use_nodes, Tex.nodetree, MTex.which_output in RNA * Added node controls to texture buttons (Use Nodes and Use Output) * Made new texture outputs have unique names by default, though unique names still aren't required. Note: The preview window in the texture buttons only takes which_output into account when in "material" mode, and in the material half of "both" mode; the plain texture display ignores the user's output choice. This is because ED_preview_draw draws a Tex* and not an MTex* -- still some work to do here.
2009-08-17 18:37:58 +00:00
class TEXTURE_PT_musgrave(TextureTypePanel):
change blender python interface for classes not to ise __idname__ rather bl_idname since __somename__ is for pythons internal use. replacements... "__idname__" -> "bl_idname" "__props__" -> "bl_props" "__label__" -> "bl_label" "__register__" -> "bl_register" "__undo__" -> "bl_undo" "__space_type__" -> "bl_space_type" "__default_closed__" -> "bl_default_closed" "__region_type__" -> "bl_region_type" "__context__" -> "bl_context" "__show_header__" -> "bl_show_header" "__URL__" -> "_url"
2009-10-31 13:31:23 +00:00
bl_label = "Musgrave"
Made texture nodes accessible in the interface. * Exposed Tex.use_nodes, Tex.nodetree, MTex.which_output in RNA * Added node controls to texture buttons (Use Nodes and Use Output) * Made new texture outputs have unique names by default, though unique names still aren't required. Note: The preview window in the texture buttons only takes which_output into account when in "material" mode, and in the material half of "both" mode; the plain texture display ignores the user's output choice. This is because ED_preview_draw draws a Tex* and not an MTex* -- still some work to do here.
2009-08-17 18:37:58 +00:00
tex_type = 'MUSGRAVE'
2.5 Buttons: * Added initial Texture Buttons by William Reynish. Thanks! Note: I did some code cleanup and fixes to the code. * Texture RNA fixes.
2009-05-22 12:07:03 +00:00
def draw(self, context):
layout = self.layout
2.5 Button Files: * Cleanup of smoke and texture files to match guidelines. * Made "Curve" Panel in Toolbar Closed per default.
2009-08-08 17:21:34 +00:00
UI: * Add Lamp Fallof Curve and Texture Color Ramp panels. * Use button space context data. * A few other minor python layout script updates.
2009-06-03 00:17:35 +00:00
tex = context.texture
2.5 Buttons: * Added initial Texture Buttons by William Reynish. Thanks! Note: I did some code cleanup and fixes to the code. * Texture RNA fixes.
2009-05-22 12:07:03 +00:00
* Small tweaks to texture panels
2009-05-26 02:49:46 +00:00
layout.itemR(tex, "musgrave_type")
2.5 Buttons: * Added initial Texture Buttons by William Reynish. Thanks! Note: I did some code cleanup and fixes to the code. * Texture RNA fixes.
2009-05-22 12:07:03 +00:00
split = layout.split()
2.5 Button Files: * Cleanup of smoke and texture files to match guidelines. * Made "Curve" Panel in Toolbar Closed per default.
2009-08-08 17:21:34 +00:00
col = split.column()
col.itemR(tex, "highest_dimension", text="Dimension")
col.itemR(tex, "lacunarity")
col.itemR(tex, "octaves")
col = split.column()
2.5 Buttons: * Added initial Texture Buttons by William Reynish. Thanks! Note: I did some code cleanup and fixes to the code. * Texture RNA fixes.
2009-05-22 12:07:03 +00:00
if (tex.musgrave_type in ('HETERO_TERRAIN', 'RIDGED_MULTIFRACTAL', 'HYBRID_MULTIFRACTAL')):
2.5 Button Files: * Cleanup of smoke and texture files to match guidelines. * Made "Curve" Panel in Toolbar Closed per default.
2009-08-08 17:21:34 +00:00
col.itemR(tex, "offset")
2.5 Buttons: * Added initial Texture Buttons by William Reynish. Thanks! Note: I did some code cleanup and fixes to the code. * Texture RNA fixes.
2009-05-22 12:07:03 +00:00
if (tex.musgrave_type in ('RIDGED_MULTIFRACTAL', 'HYBRID_MULTIFRACTAL')):
2.5 Button Files: * Cleanup of smoke and texture files to match guidelines. * Made "Curve" Panel in Toolbar Closed per default.
2009-08-08 17:21:34 +00:00
col.itemR(tex, "gain")
col.itemR(tex, "noise_intensity", text="Intensity")
2.5 Buttons: * Added initial Texture Buttons by William Reynish. Thanks! Note: I did some code cleanup and fixes to the code. * Texture RNA fixes.
2009-05-22 12:07:03 +00:00
layout.itemL(text="Noise:")
* Small tweaks to texture panels
2009-05-26 02:49:46 +00:00
2.5 Buttons: * Added initial Texture Buttons by William Reynish. Thanks! Note: I did some code cleanup and fixes to the code. * Texture RNA fixes.
2009-05-22 12:07:03 +00:00
layout.itemR(tex, "noise_basis", text="Basis")
row = layout.row()
row.itemR(tex, "noise_size", text="Size")
row.itemR(tex, "nabla")
Made texture nodes accessible in the interface. * Exposed Tex.use_nodes, Tex.nodetree, MTex.which_output in RNA * Added node controls to texture buttons (Use Nodes and Use Output) * Made new texture outputs have unique names by default, though unique names still aren't required. Note: The preview window in the texture buttons only takes which_output into account when in "material" mode, and in the material half of "both" mode; the plain texture display ignores the user's output choice. This is because ED_preview_draw draws a Tex* and not an MTex* -- still some work to do here.
2009-08-17 18:37:58 +00:00
class TEXTURE_PT_voronoi(TextureTypePanel):
change blender python interface for classes not to ise __idname__ rather bl_idname since __somename__ is for pythons internal use. replacements... "__idname__" -> "bl_idname" "__props__" -> "bl_props" "__label__" -> "bl_label" "__register__" -> "bl_register" "__undo__" -> "bl_undo" "__space_type__" -> "bl_space_type" "__default_closed__" -> "bl_default_closed" "__region_type__" -> "bl_region_type" "__context__" -> "bl_context" "__show_header__" -> "bl_show_header" "__URL__" -> "_url"
2009-10-31 13:31:23 +00:00
bl_label = "Voronoi"
Made texture nodes accessible in the interface. * Exposed Tex.use_nodes, Tex.nodetree, MTex.which_output in RNA * Added node controls to texture buttons (Use Nodes and Use Output) * Made new texture outputs have unique names by default, though unique names still aren't required. Note: The preview window in the texture buttons only takes which_output into account when in "material" mode, and in the material half of "both" mode; the plain texture display ignores the user's output choice. This is because ED_preview_draw draws a Tex* and not an MTex* -- still some work to do here.
2009-08-17 18:37:58 +00:00
tex_type = 'VORONOI'
2.5 Buttons: * Added initial Texture Buttons by William Reynish. Thanks! Note: I did some code cleanup and fixes to the code. * Texture RNA fixes.
2009-05-22 12:07:03 +00:00
def draw(self, context):
layout = self.layout
2.5 Button Files: * Cleanup of smoke and texture files to match guidelines. * Made "Curve" Panel in Toolbar Closed per default.
2009-08-08 17:21:34 +00:00
UI: * Add Lamp Fallof Curve and Texture Color Ramp panels. * Use button space context data. * A few other minor python layout script updates.
2009-06-03 00:17:35 +00:00
tex = context.texture
2.5 Buttons: * Added initial Texture Buttons by William Reynish. Thanks! Note: I did some code cleanup and fixes to the code. * Texture RNA fixes.
2009-05-22 12:07:03 +00:00
split = layout.split()
2.5 Button Files: * Cleanup of smoke and texture files to match guidelines. * Made "Curve" Panel in Toolbar Closed per default.
2009-08-08 17:21:34 +00:00
col = split.column()
col.itemL(text="Distance Metric:")
col.itemR(tex, "distance_metric", text="")
sub = col.column()
sub.active = tex.distance_metric == 'MINKOVSKY'
sub.itemR(tex, "minkovsky_exponent", text="Exponent")
col.itemL(text="Coloring:")
col.itemR(tex, "coloring", text="")
col.itemR(tex, "noise_intensity", text="Intensity")
col = split.column(align=True)
col.itemL(text="Feature Weights:")
col.itemR(tex, "weight_1", text="1", slider=True)
col.itemR(tex, "weight_2", text="2", slider=True)
col.itemR(tex, "weight_3", text="3", slider=True)
col.itemR(tex, "weight_4", text="4", slider=True)
2.5 Buttons: * Added initial Texture Buttons by William Reynish. Thanks! Note: I did some code cleanup and fixes to the code. * Texture RNA fixes.
2009-05-22 12:07:03 +00:00
layout.itemL(text="Noise:")
row = layout.row()
row.itemR(tex, "noise_size", text="Size")
row.itemR(tex, "nabla")
Made texture nodes accessible in the interface. * Exposed Tex.use_nodes, Tex.nodetree, MTex.which_output in RNA * Added node controls to texture buttons (Use Nodes and Use Output) * Made new texture outputs have unique names by default, though unique names still aren't required. Note: The preview window in the texture buttons only takes which_output into account when in "material" mode, and in the material half of "both" mode; the plain texture display ignores the user's output choice. This is because ED_preview_draw draws a Tex* and not an MTex* -- still some work to do here.
2009-08-17 18:37:58 +00:00
class TEXTURE_PT_distortednoise(TextureTypePanel):
change blender python interface for classes not to ise __idname__ rather bl_idname since __somename__ is for pythons internal use. replacements... "__idname__" -> "bl_idname" "__props__" -> "bl_props" "__label__" -> "bl_label" "__register__" -> "bl_register" "__undo__" -> "bl_undo" "__space_type__" -> "bl_space_type" "__default_closed__" -> "bl_default_closed" "__region_type__" -> "bl_region_type" "__context__" -> "bl_context" "__show_header__" -> "bl_show_header" "__URL__" -> "_url"
2009-10-31 13:31:23 +00:00
bl_label = "Distorted Noise"
Made texture nodes accessible in the interface. * Exposed Tex.use_nodes, Tex.nodetree, MTex.which_output in RNA * Added node controls to texture buttons (Use Nodes and Use Output) * Made new texture outputs have unique names by default, though unique names still aren't required. Note: The preview window in the texture buttons only takes which_output into account when in "material" mode, and in the material half of "both" mode; the plain texture display ignores the user's output choice. This is because ED_preview_draw draws a Tex* and not an MTex* -- still some work to do here.
2009-08-17 18:37:58 +00:00
tex_type = 'DISTORTED_NOISE'
2.5 Buttons: * Added initial Texture Buttons by William Reynish. Thanks! Note: I did some code cleanup and fixes to the code. * Texture RNA fixes.
2009-05-22 12:07:03 +00:00
def draw(self, context):
layout = self.layout
2.5 Button Files: * Cleanup of smoke and texture files to match guidelines. * Made "Curve" Panel in Toolbar Closed per default.
2009-08-08 17:21:34 +00:00
UI: * Add Lamp Fallof Curve and Texture Color Ramp panels. * Use button space context data. * A few other minor python layout script updates.
2009-06-03 00:17:35 +00:00
tex = context.texture
texture buttons raised py errors when there were no textures on an object
2009-05-25 14:58:10 +00:00
2.5 Buttons: * Added initial Texture Buttons by William Reynish. Thanks! Note: I did some code cleanup and fixes to the code. * Texture RNA fixes.
2009-05-22 12:07:03 +00:00
layout.itemR(tex, "noise_distortion")
layout.itemR(tex, "noise_basis", text="Basis")
2.5 Button Files: * Cleanup of smoke and texture files to match guidelines. * Made "Curve" Panel in Toolbar Closed per default.
2009-08-08 17:21:34 +00:00
flow = layout.column_flow()
remove "_amount" from rna names, its not helpful.
2009-08-31 16:36:02 +00:00
flow.itemR(tex, "distortion", text="Distortion")
2.5 Button Files: * Cleanup of smoke and texture files to match guidelines. * Made "Curve" Panel in Toolbar Closed per default.
2009-08-08 17:21:34 +00:00
flow.itemR(tex, "noise_size", text="Size")
flow.itemR(tex, "nabla")
* First commit merging 2.4-based sim_physics in to volume25 branch. Integration is still very rough around the edges and WIP, but it works, and can render smoke (using new Smoke format in Voxel Data texture) --> http://vimeo.com/6030983 More to come, but this makes things much easier to work on for me :)
2009-08-13 05:21:25 +00:00
class TEXTURE_PT_voxeldata(TextureButtonsPanel):
change blender python interface for classes not to ise __idname__ rather bl_idname since __somename__ is for pythons internal use. replacements... "__idname__" -> "bl_idname" "__props__" -> "bl_props" "__label__" -> "bl_label" "__register__" -> "bl_register" "__undo__" -> "bl_undo" "__space_type__" -> "bl_space_type" "__default_closed__" -> "bl_default_closed" "__region_type__" -> "bl_region_type" "__context__" -> "bl_context" "__show_header__" -> "bl_show_header" "__URL__" -> "_url"
2009-10-31 13:31:23 +00:00
bl_label = "Voxel Data"
2.5 Layout Files: * Some Code and Whitespace Cleanup.
2009-09-27 11:00:35 +00:00
* First commit merging 2.4-based sim_physics in to volume25 branch. Integration is still very rough around the edges and WIP, but it works, and can render smoke (using new Smoke format in Voxel Data texture) --> http://vimeo.com/6030983 More to come, but this makes things much easier to work on for me :)
2009-08-13 05:21:25 +00:00
def poll(self, context):
tex = context.texture
return (tex and tex.type == 'VOXEL_DATA')
def draw(self, context):
layout = self.layout
2.5 Volumetric: * Wrapped some missing Point Density RNA and added the options to the UI. * Some UI changes (greying out...) Matt: Please check. :)
2009-08-27 18:24:12 +00:00
* First commit merging 2.4-based sim_physics in to volume25 branch. Integration is still very rough around the edges and WIP, but it works, and can render smoke (using new Smoke format in Voxel Data texture) --> http://vimeo.com/6030983 More to come, but this makes things much easier to work on for me :)
2009-08-13 05:21:25 +00:00
tex = context.texture
vd = tex.voxeldata
layout.itemR(vd, "file_format")
if vd.file_format in ['BLENDER_VOXEL', 'RAW_8BIT']:
layout.itemR(vd, "source_path")
if vd.file_format == 'RAW_8BIT':
layout.itemR(vd, "resolution")
2.5 Volumetric: * Wrapped some missing Point Density RNA and added the options to the UI. * Some UI changes (greying out...) Matt: Please check. :)
2009-08-27 18:24:12 +00:00
elif vd.file_format == 'SMOKE':
volume material * data reorganisation - uses own values now instead of reusing surface material properties (i.e. an individual density value, rather than reusing alpha) Files saved with the old system won't load up the same after this. * improved defaults and ui
2009-08-16 06:10:31 +00:00
layout.itemR(vd, "domain_object")
* First commit merging 2.4-based sim_physics in to volume25 branch. Integration is still very rough around the edges and WIP, but it works, and can render smoke (using new Smoke format in Voxel Data texture) --> http://vimeo.com/6030983 More to come, but this makes things much easier to work on for me :)
2009-08-13 05:21:25 +00:00
layout.itemR(vd, "still")
2.5 Volumetric: * Wrapped some missing Point Density RNA and added the options to the UI. * Some UI changes (greying out...) Matt: Please check. :)
2009-08-27 18:24:12 +00:00
row = layout.row()
row.active = vd.still
row.itemR(vd, "still_frame_number")
* First commit merging 2.4-based sim_physics in to volume25 branch. Integration is still very rough around the edges and WIP, but it works, and can render smoke (using new Smoke format in Voxel Data texture) --> http://vimeo.com/6030983 More to come, but this makes things much easier to work on for me :)
2009-08-13 05:21:25 +00:00
layout.itemR(vd, "interpolation")
Rework of volume shading After code review and experimentation, this commit makes some changes to the way that volumes are shaded. Previously, there were problems with the 'scattering' component, in that it wasn't physically correct - it didn't conserve energy and was just acting as a brightness multiplier. This has been changed to be more correct, so that as the light is scattered out of the volume, there is less remaining to penetrate through. Since this behaviour is very similar to absorption but more useful, absorption has been removed and has been replaced by a 'transmission colour' - controlling the colour of light penetrating through the volume after it has been scattered/absorbed. As well as this, there's now 'reflection', a non-physically correct RGB multiplier for out-scattered light. This is handy for tweaking the overall colour of the volume, without having to worry about wavelength dependent absorption, and its effects on transmitted light. Now at least, even though there is the ability to tweak things non-physically, volume shading is physically based by default, and has a better combination of correctness and ease of use. There's more detailed information and example images here: http://wiki.blender.org/index.php/User:Broken/VolumeRendering Also did some tweaks/optimisation: * Removed shading step size (was a bit annoying, if it comes back, it will be in a different form) * Removed phase function options, now just one asymmetry slider controls the range between back-scattering, isotropic scattering, and forward scattering. (note, more extreme values gives artifacts with light cache, will fix...) * Disabled the extra 'bounce lights' from the preview render for volumes, speeds updates significantly * Enabled voxeldata texture in preview render * Fixed volume shadows (they were too dark, fixed by avoiding using the shadfac/AddAlphaLight stuff) More revisions to come later...
2009-09-29 22:01:32 +00:00
layout.itemR(vd, "extension")
* First commit merging 2.4-based sim_physics in to volume25 branch. Integration is still very rough around the edges and WIP, but it works, and can render smoke (using new Smoke format in Voxel Data texture) --> http://vimeo.com/6030983 More to come, but this makes things much easier to work on for me :)
2009-08-13 05:21:25 +00:00
layout.itemR(vd, "intensity")
class TEXTURE_PT_pointdensity(TextureButtonsPanel):
change blender python interface for classes not to ise __idname__ rather bl_idname since __somename__ is for pythons internal use. replacements... "__idname__" -> "bl_idname" "__props__" -> "bl_props" "__label__" -> "bl_label" "__register__" -> "bl_register" "__undo__" -> "bl_undo" "__space_type__" -> "bl_space_type" "__default_closed__" -> "bl_default_closed" "__region_type__" -> "bl_region_type" "__context__" -> "bl_context" "__show_header__" -> "bl_show_header" "__URL__" -> "_url"
2009-10-31 13:31:23 +00:00
bl_label = "Point Density"
2.5 Layout Files: * Some Code and Whitespace Cleanup.
2009-09-27 11:00:35 +00:00
* First commit merging 2.4-based sim_physics in to volume25 branch. Integration is still very rough around the edges and WIP, but it works, and can render smoke (using new Smoke format in Voxel Data texture) --> http://vimeo.com/6030983 More to come, but this makes things much easier to work on for me :)
2009-08-13 05:21:25 +00:00
def poll(self, context):
tex = context.texture
return (tex and tex.type == 'POINT_DENSITY')
def draw(self, context):
layout = self.layout
2.5 Volumetric: * Wrapped some missing Point Density RNA and added the options to the UI. * Some UI changes (greying out...) Matt: Please check. :)
2009-08-27 18:24:12 +00:00
* First commit merging 2.4-based sim_physics in to volume25 branch. Integration is still very rough around the edges and WIP, but it works, and can render smoke (using new Smoke format in Voxel Data texture) --> http://vimeo.com/6030983 More to come, but this makes things much easier to work on for me :)
2009-08-13 05:21:25 +00:00
tex = context.texture
pd = tex.pointdensity
2.5: * Deleted the box layout in logic editor, as discussed in IRC. We need a better solution here, maybe 2 lines? * Typo in Sequencer RNA.
2009-08-27 19:10:53 +00:00
2.5 Volumetric: * Wrapped some missing Point Density RNA and added the options to the UI. * Some UI changes (greying out...) Matt: Please check. :)
2009-08-27 18:24:12 +00:00
layout.itemR(pd, "point_source", expand=True)
2.5: * Deleted the box layout in logic editor, as discussed in IRC. We need a better solution here, maybe 2 lines? * Typo in Sequencer RNA.
2009-08-27 19:10:53 +00:00
split = layout.split()
col = split.column()
* Point density texture works again
2009-08-17 22:09:36 +00:00
if pd.point_source == 'PARTICLE_SYSTEM':
* Fixes for point density texture
2009-08-29 00:41:14 +00:00
col.itemL(text="Object:")
col.itemR(pd, "object", text="")
2.5 Buttons: * Fix for Point Density Texture panel. "System" label was there before the pointer button showed up. (For Source Type Particle System.)
2009-09-01 14:59:50 +00:00
sub = col.column()
sub.enabled = pd.object
if pd.object:
sub.itemL(text="System:")
sub.item_pointerR(pd, "particle_system", pd.object, "particle_systems", text="")
sub.itemL(text="Cache:")
sub.itemR(pd, "particle_cache", text="")
2.5 Volumetric: * Wrapped some missing Point Density RNA and added the options to the UI. * Some UI changes (greying out...) Matt: Please check. :)
2009-08-27 18:24:12 +00:00
else:
2.5: * Deleted the box layout in logic editor, as discussed in IRC. We need a better solution here, maybe 2 lines? * Typo in Sequencer RNA.
2009-08-27 19:10:53 +00:00
col.itemL(text="Object:")
col.itemR(pd, "object", text="")
col.itemL(text="Cache:")
col.itemR(pd, "vertices_cache", text="")
2.5 Volumetric: * Wrapped some missing Point Density RNA and added the options to the UI. * Some UI changes (greying out...) Matt: Please check. :)
2009-08-27 18:24:12 +00:00
2.5 Buttons: * Fix for Point Density Texture panel. "System" label was there before the pointer button showed up. (For Source Type Particle System.)
2009-09-01 14:59:50 +00:00
col.itemS()
2.5 Volumetric: * Wrapped some missing Point Density RNA and added the options to the UI. * Some UI changes (greying out...) Matt: Please check. :)
2009-08-27 18:24:12 +00:00
2.5: * Deleted the box layout in logic editor, as discussed in IRC. We need a better solution here, maybe 2 lines? * Typo in Sequencer RNA.
2009-08-27 19:10:53 +00:00
col.itemL(text="Color Source:")
col.itemR(pd, "color_source", text="")
2.5 Volumetric: * Wrapped some missing Point Density RNA and added the options to the UI. * Some UI changes (greying out...) Matt: Please check. :)
2009-08-27 18:24:12 +00:00
if pd.color_source in ('PARTICLE_SPEED', 'PARTICLE_VELOCITY'):
2.5: * Deleted the box layout in logic editor, as discussed in IRC. We need a better solution here, maybe 2 lines? * Typo in Sequencer RNA.
2009-08-27 19:10:53 +00:00
col.itemR(pd, "speed_scale")
2.5 Volumetric: * Wrapped some missing Point Density RNA and added the options to the UI. * Some UI changes (greying out...) Matt: Please check. :)
2009-08-27 18:24:12 +00:00
if pd.color_source in ('PARTICLE_SPEED', 'PARTICLE_AGE'):
UI * Fix problem with curve mapping / color ramps not updating things like previews propertly. Now it uses the RNA update of the pointer from the material/texture/.. so each of those can define their own update, but still share the RNA struct. * Code for these templates is now in interface_templates.c * Fix exception for "axis" property, now it always shows normal widget with the PROP_DIRECTION subtype. * Remove context from uiBlockLayoutResolve, no longer needed.
2009-09-16 18:47:42 +00:00
layout.template_color_ramp(pd, "color_ramp", expand=True)
2.5 Buttons: * Added initial Texture Buttons by William Reynish. Thanks! Note: I did some code cleanup and fixes to the code. * Texture RNA fixes.
2009-05-22 12:07:03 +00:00
2.5 Buttons: * Fix for Point Density Texture panel. "System" label was there before the pointer button showed up. (For Source Type Particle System.)
2009-09-01 14:59:50 +00:00
col = split.column()
col.itemL()
col.itemR(pd, "radius")
col.itemL(text="Falloff:")
col.itemR(pd, "falloff", text="")
if pd.falloff == 'SOFT':
col.itemR(pd, "falloff_softness")
2.5: * Deleted the box layout in logic editor, as discussed in IRC. We need a better solution here, maybe 2 lines? * Typo in Sequencer RNA.
2009-08-27 19:10:53 +00:00
class TEXTURE_PT_pointdensity_turbulence(TextureButtonsPanel):
change blender python interface for classes not to ise __idname__ rather bl_idname since __somename__ is for pythons internal use. replacements... "__idname__" -> "bl_idname" "__props__" -> "bl_props" "__label__" -> "bl_label" "__register__" -> "bl_register" "__undo__" -> "bl_undo" "__space_type__" -> "bl_space_type" "__default_closed__" -> "bl_default_closed" "__region_type__" -> "bl_region_type" "__context__" -> "bl_context" "__show_header__" -> "bl_show_header" "__URL__" -> "_url"
2009-10-31 13:31:23 +00:00
bl_label = "Turbulence"
2.5: * Deleted the box layout in logic editor, as discussed in IRC. We need a better solution here, maybe 2 lines? * Typo in Sequencer RNA.
2009-08-27 19:10:53 +00:00
def poll(self, context):
tex = context.texture
return (tex and tex.type == 'POINT_DENSITY')
def draw_header(self, context):
layout = self.layout
tex = context.texture
pd = tex.pointdensity
layout.itemR(pd, "turbulence", text="")
def draw(self, context):
layout = self.layout
tex = context.texture
pd = tex.pointdensity
layout.active = pd.turbulence
split = layout.split()
col = split.column()
col.itemL(text="Influence:")
col.itemR(pd, "turbulence_influence", text="")
col.itemL(text="Noise Basis:")
col.itemR(pd, "noise_basis", text="")
col = split.column()
col.itemL()
col.itemR(pd, "turbulence_size")
col.itemR(pd, "turbulence_depth")
col.itemR(pd, "turbulence_strength")
patch from William, panel names need to be unique
2009-07-09 09:42:34 +00:00
bpy.types.register(TEXTURE_PT_context_texture)
UI: * Added panels with dummy preview template. * Added constraints panel for bones next to objects, though it doesn't work that well yet, the operators and code need to be changed so they don't assume it is one or the other in/out of posemode. * Added some graying out in the scene and world buttons.
2009-05-28 23:45:50 +00:00
bpy.types.register(TEXTURE_PT_preview)
2.5 Volumetric: * Wrapped some missing Point Density RNA and added the options to the UI. * Some UI changes (greying out...) Matt: Please check. :)
2009-08-27 18:24:12 +00:00
bpy.types.register(TEXTURE_PT_clouds) # Texture Type Panels
2.5 Buttons: * Added initial Texture Buttons by William Reynish. Thanks! Note: I did some code cleanup and fixes to the code. * Texture RNA fixes.
2009-05-22 12:07:03 +00:00
bpy.types.register(TEXTURE_PT_wood)
bpy.types.register(TEXTURE_PT_marble)
bpy.types.register(TEXTURE_PT_magic)
bpy.types.register(TEXTURE_PT_blend)
bpy.types.register(TEXTURE_PT_stucci)
bpy.types.register(TEXTURE_PT_image)
2.5: Texture Buttons * World and Lamp previews now working here too. * Experiment with list template, showing only icons. Unfortunately texture icon render crashes combined with preview render so it shows all icons the same. * Influence panels updated, with slider for each option. The values are still linked though, will fix that later. * Image texture controls a bit more complete, still WIP. * Color ramp back.
2009-07-21 12:57:55 +00:00
bpy.types.register(TEXTURE_PT_image_sampling)
bpy.types.register(TEXTURE_PT_image_mapping)
2.5 Buttons: * Added initial Texture Buttons by William Reynish. Thanks! Note: I did some code cleanup and fixes to the code. * Texture RNA fixes.
2009-05-22 12:07:03 +00:00
bpy.types.register(TEXTURE_PT_plugin)
bpy.types.register(TEXTURE_PT_envmap)
bpy.types.register(TEXTURE_PT_musgrave)
bpy.types.register(TEXTURE_PT_voronoi)
texture buttons raised py errors when there were no textures on an object
2009-05-25 14:58:10 +00:00
bpy.types.register(TEXTURE_PT_distortednoise)
* First commit merging 2.4-based sim_physics in to volume25 branch. Integration is still very rough around the edges and WIP, but it works, and can render smoke (using new Smoke format in Voxel Data texture) --> http://vimeo.com/6030983 More to come, but this makes things much easier to work on for me :)
2009-08-13 05:21:25 +00:00
bpy.types.register(TEXTURE_PT_voxeldata)
bpy.types.register(TEXTURE_PT_pointdensity)
2.5: * Deleted the box layout in logic editor, as discussed in IRC. We need a better solution here, maybe 2 lines? * Typo in Sequencer RNA.
2009-08-27 19:10:53 +00:00
bpy.types.register(TEXTURE_PT_pointdensity_turbulence)
2.5 Volumetric: * Wrapped some missing Point Density RNA and added the options to the UI. * Some UI changes (greying out...) Matt: Please check. :)
2009-08-27 18:24:12 +00:00
UI: * Map panel in the Textures tab, patch by William. Note many properties here are not RNA wrapped yet.
2009-06-08 19:44:07 +00:00
bpy.types.register(TEXTURE_PT_colors)
Texture panel tweaks by William.
2009-06-09 16:52:02 +00:00
bpy.types.register(TEXTURE_PT_mapping)
UI scripts: * Close some material/texture panels by default. * Update material buttons to use more diffuse/specular variables. * Don't show texture mapping/influence when the texture is pinned. * Small visual tweak for sequencer header menus.
2009-06-16 01:25:49 +00:00
bpy.types.register(TEXTURE_PT_influence)
minor changes to texture ui, not user visible
2009-10-12 14:38:35 +00:00
Reference in New Issue Copy Permalink