~ubuntu-branches/ubuntu/utopic/blender/utopic-proposed

« back to all changes in this revision

Viewing changes to release/scripts/startup/bl_ui/properties_physics_dynamicpaint.py

  • Committer: Package Import Robot
  • Author(s): Matthias Klose
  • Date: 2014-02-19 11:24:23 UTC
  • mfrom: (14.2.23 sid)
  • Revision ID: package-import@ubuntu.com-20140219112423-rkmaz2m7ha06d4tk
Tags: 2.69-3ubuntu1
* Merge with Debian; remaining changes:
  - Configure without OpenImageIO on armhf, as it is not available on
    Ubuntu.

Show diffs side-by-side

added added

removed removed

Lines of Context:
201
201
            col = split.column(align=True)
202
202
            col.prop(surface, "wave_damping")
203
203
            col.prop(surface, "wave_spring")
 
204
            col.prop(surface, "wave_smoothness")
204
205
 
205
206
        layout.separator()
206
207
        layout.prop(surface, "brush_group")