diff options
author | Miika Hamalainen <blender@miikah.org> | 2011-06-16 14:41:00 +0400 |
---|---|---|
committer | Miika Hamalainen <blender@miikah.org> | 2011-06-16 14:41:00 +0400 |
commit | 3de22dec26606c2c526f7193db038fa5125f9b03 (patch) | |
tree | dd308dd2061a50b0f1bc2e63b6c05716f9bcab73 /release/scripts/startup/bl_ui/properties_physics_common.py | |
parent | 3b41ab432badf2d4598b798e0d0c6c9ece51172b (diff) |
Dynamic Paint:
Committed changes from previous weeks, biggest changes are:
* Canvas can now have multiple "surfaces" that each can have specific format, type and settings.
* Renewed UI to support this new system.
* Aside from old "image sequence" output format, Dynamic Paint can now work on vertex level as well. Currently vertex paint and displace are supported.
* Integrated vertex level painting with Point Cache.
* Added viewport preview for Point Cache surfaces.
Due to massive amount of changes, old Dynamic Paint saves are no longer supported. Also some features are temporarily missing or may not work properly.
Diffstat (limited to 'release/scripts/startup/bl_ui/properties_physics_common.py')
-rw-r--r-- | release/scripts/startup/bl_ui/properties_physics_common.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/release/scripts/startup/bl_ui/properties_physics_common.py b/release/scripts/startup/bl_ui/properties_physics_common.py index 0030abff71b..8ec9ffd0b83 100644 --- a/release/scripts/startup/bl_ui/properties_physics_common.py +++ b/release/scripts/startup/bl_ui/properties_physics_common.py @@ -64,7 +64,7 @@ class PHYSICS_PT_add(PhysicButtonsPanel, bpy.types.Panel): if(ob.type == 'MESH'): physics_add(self, col, context.collision, "Collision", 'COLLISION', 'MOD_PHYSICS', False) physics_add(self, col, context.cloth, "Cloth", 'CLOTH', 'MOD_CLOTH', True) - physics_add(self, col, context.dynamic_paint, "Dynamic Paint", 'DYNAMIC_PAINT', 'MOD_FLUIDSIM', True) + physics_add(self, col, context.dynamic_paint, "Dynamic Paint", 'DYNAMIC_PAINT', 'MOD_DYNAMICPAINT', True) col = split.column() @@ -106,7 +106,7 @@ def point_cache_ui(self, context, cache, enabled, cachetype): layout.label(text=cache.info) else: - if cachetype == 'SMOKE': + if cachetype in {'SMOKE', 'DYNAMIC_PAINT'}: if not bpy.data.is_saved: layout.label(text="Cache is disabled until the file is saved") layout.enabled = False @@ -118,17 +118,17 @@ def point_cache_ui(self, context, cache, enabled, cachetype): row = layout.row(align=True) - if cachetype != 'PSYS': + if cachetype not in {'PSYS', 'DYNAMIC_PAINT'}: row.enabled = enabled row.prop(cache, "frame_start") row.prop(cache, "frame_end") - if cachetype not in {'SMOKE', 'CLOTH'}: + if cachetype not in {'SMOKE', 'CLOTH', 'DYNAMIC_PAINT'}: row.prop(cache, "frame_step") row.prop(cache, "use_quick_cache") if cachetype != 'SMOKE': layout.label(text=cache.info) - if cachetype != 'SMOKE': + if cachetype not in {'SMOKE', 'DYNAMIC_PAINT'}: split = layout.split() split.enabled = enabled and bpy.data.is_saved |