diff options
author | Campbell Barton <ideasman42@gmail.com> | 2011-11-15 06:58:06 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2011-11-15 06:58:06 +0400 |
commit | e6e265b2b59e02cc7816a2ed43471eca8bca0a62 (patch) | |
tree | e312d2c2f6cb1aaf79148648e5725902ab23d34e /release/scripts/startup/bl_ui/properties_physics_dynamicpaint.py | |
parent | e59ab6486f9e7285815671044b785c28365d5165 (diff) | |
parent | 3442c16c09b31a23f45b23be72e6eb5ba02c7bbf (diff) |
svn merge -r41779:41847 ^/trunk/blender
Diffstat (limited to 'release/scripts/startup/bl_ui/properties_physics_dynamicpaint.py')
-rw-r--r-- | release/scripts/startup/bl_ui/properties_physics_dynamicpaint.py | 60 |
1 files changed, 30 insertions, 30 deletions
diff --git a/release/scripts/startup/bl_ui/properties_physics_dynamicpaint.py b/release/scripts/startup/bl_ui/properties_physics_dynamicpaint.py index a934e103c35..251606a6341 100644 --- a/release/scripts/startup/bl_ui/properties_physics_dynamicpaint.py +++ b/release/scripts/startup/bl_ui/properties_physics_dynamicpaint.py @@ -99,8 +99,8 @@ class PHYSICS_PT_dynamic_paint(PhysicButtonsPanel, Panel): split = layout.split() col = split.column() - col.prop(brush, "absolute_alpha") - col.prop(brush, "paint_erase") + col.prop(brush, "use_absolute_alpha") + col.prop(brush, "use_paint_erase") col.prop(brush, "paint_wetness", text="Wetness") col = split.column() @@ -168,7 +168,7 @@ class PHYSICS_PT_dp_advanced_canvas(PhysicButtonsPanel, Panel): row.prop(surface, "displace_factor") elif surface_type == 'WAVE': - layout.prop(surface, "wave_open_borders") + layout.prop(surface, "use_wave_open_border") split = layout.split() @@ -213,33 +213,33 @@ class PHYSICS_PT_dp_canvas_output(PhysicButtonsPanel, Panel): # paintmap output row = layout.row() - row.prop_search(surface, "output_name", ob.data, "vertex_colors", text="Paintmap layer: ") + row.prop_search(surface, "output_name_a", ob.data, "vertex_colors", text="Paintmap layer: ") if surface.output_exists(object=ob, index=0): ic = 'ZOOMOUT' else: ic = 'ZOOMIN' - row.operator("dpaint.output_toggle", icon=ic, text="").index = 0 + row.operator("dpaint.output_toggle", icon=ic, text="").output = 'A' # wetmap output row = layout.row() - row.prop_search(surface, "output_name2", ob.data, "vertex_colors", text="Wetmap layer: ") + row.prop_search(surface, "output_name_b", ob.data, "vertex_colors", text="Wetmap layer: ") if surface.output_exists(object=ob, index=1): ic = 'ZOOMOUT' else: ic = 'ZOOMIN' - row.operator("dpaint.output_toggle", icon=ic, text="").index = 1 + row.operator("dpaint.output_toggle", icon=ic, text="").output = 'B' elif surface_type == 'WEIGHT': row = layout.row() - row.prop_search(surface, "output_name", ob, "vertex_groups", text="Vertex Group: ") + row.prop_search(surface, "output_name_a", ob, "vertex_groups", text="Vertex Group: ") if surface.output_exists(object=ob, index=0): ic = 'ZOOMOUT' else: ic = 'ZOOMIN' - row.operator("dpaint.output_toggle", icon=ic, text="").index = 0 + row.operator("dpaint.output_toggle", icon=ic, text="").output = 'A' # image format outputs if surface.surface_format == 'IMAGE': @@ -250,23 +250,23 @@ class PHYSICS_PT_dp_canvas_output(PhysicButtonsPanel, Panel): layout.prop(surface, "image_output_path", text="") row = layout.row() row.prop(surface, "image_fileformat", text="") - row.prop(surface, "premultiply", text="Premultiply alpha") + row.prop(surface, "use_premultiply", text="Premultiply alpha") if surface_type == 'PAINT': split = layout.split(percentage=0.4) - split.prop(surface, "do_output1", text="Paintmaps:") + split.prop(surface, "use_output_a", text="Paintmaps:") sub = split.row() - sub.active = surface.do_output1 - sub.prop(surface, "output_name", text="") + sub.active = surface.use_output_a + sub.prop(surface, "output_name_a", text="") split = layout.split(percentage=0.4) - split.prop(surface, "do_output2", text="Wetmaps:") + split.prop(surface, "do_output_b", text="Wetmaps:") sub = split.row() - sub.active = surface.do_output2 - sub.prop(surface, "output_name2", text="") + sub.active = surface.do_output_b + sub.prop(surface, "output_name_b", text="") else: col = layout.column() - col.prop(surface, "output_name", text="Filename: ") + col.prop(surface, "output_name_a", text="Filename: ") if surface_type == 'DISPLACE': col.prop(surface, "displace_type", text="Displace Type") col.prop(surface, "depth_clamp") @@ -367,7 +367,7 @@ class PHYSICS_PT_dp_cache(PhysicButtonsPanel, Panel): md.ui_type == 'CANVAS' and md.canvas_settings and md.canvas_settings.canvas_surfaces.active and - md.canvas_settings.canvas_surfaces.active.uses_cache) + md.canvas_settings.canvas_surfaces.active.is_cache_user) def draw(self, context): layout = self.layout @@ -411,21 +411,21 @@ class PHYSICS_PT_dp_brush_source(PhysicButtonsPanel, Panel): split = layout.row().split(percentage=0.4) sub = split.column() if brush.paint_source == 'DISTANCE': - sub.prop(brush, "proximity_project") + sub.prop(brush, "use_proximity_project") elif brush.paint_source == 'VOLUME_DISTANCE': - sub.prop(brush, "proximity_inverse") - sub.prop(brush, "negate_volume") + sub.prop(brush, "invert_proximity") + sub.prop(brush, "use_negative_volume") sub = split.column() if brush.paint_source == 'DISTANCE': column = sub.column() - column.active = brush.proximity_project + column.active = brush.use_proximity_project column.prop(brush, "ray_direction") sub.prop(brush, "proximity_falloff") if brush.proximity_falloff == 'RAMP': col = layout.row().column() col.separator() - col.prop(brush, "proximity_ramp_alpha", text="Only Use Alpha") + col.prop(brush, "use_proximity_ramp_alpha", text="Only Use Alpha") col.template_color_ramp(brush, "paint_ramp", expand=True) @@ -447,21 +447,21 @@ class PHYSICS_PT_dp_brush_velocity(PhysicButtonsPanel, Panel): split = layout.split() col = split.column() - col.prop(brush, "velocity_alpha") - col.prop(brush, "velocity_color") + col.prop(brush, "use_velocity_alpha") + col.prop(brush, "use_velocity_color") - split.prop(brush, "velocity_depth") + split.prop(brush, "use_velocity_depth") col = layout.column() - col.active = (brush.velocity_alpha or brush.velocity_color or brush.velocity_depth) - col.prop(brush, "max_velocity") + col.active = (brush.use_velocity_alpha or brush.use_velocity_color or brush.use_velocity_depth) + col.prop(brush, "velocity_max") col.template_color_ramp(brush, "velocity_ramp", expand=True) layout.separator() row = layout.row() - row.prop(brush, "do_smudge") + row.prop(brush, "use_smudge") sub = row.row() - sub.active = brush.do_smudge + sub.active = brush.use_smudge sub.prop(brush, "smudge_strength") |