diff options
author | Bastien Montagne <montagne29@wanadoo.fr> | 2013-01-02 20:03:58 +0400 |
---|---|---|
committer | Bastien Montagne <montagne29@wanadoo.fr> | 2013-01-02 20:03:58 +0400 |
commit | dadb1ccd9298688addf811dd62e6dcc6b4f49a45 (patch) | |
tree | 3823fb516b4bd217c99778032aea3221a2c41faa /release/scripts/startup/bl_ui/properties_data_modifier.py | |
parent | 55f33619246d60050cf94fcb4ed026d5e306e10e (diff) |
Fix [#33189] AFTER 2.65 - Units in doc strings in ocean modifier.
Also:
* Fixes a (op prop) bug which prevented, once you had baked and freed ocean once, to bake again.
* Fixed infinite values of acumulated foam when baking with foam_fade values above 1.0, now simply clipping accumulated foam value to 1.0, as already done for the "instantaneaous" foam value returned by BKE_ocean_jminus_to_foam().
* Added missing RNA descriptions.
* Made foam_fade unanimatable!
* Added in UI some missing properties that are imho useful: random seed, size (kindof 'surface scaling'), and foam_fade (baking only).
* Removed custom lerp() func from bke's ocean.c, BLI's interpf does exactly the same thing (the first two args are just in reversed order). Note: this could most certainly be done in other parts of the code, bpy's mathutils for e.g. has its own linear interpolation code for vectors and matrices :/).
* Did some general code cleanup (mostly line length and no C++ -> C comments)...
Diffstat (limited to 'release/scripts/startup/bl_ui/properties_data_modifier.py')
-rw-r--r-- | release/scripts/startup/bl_ui/properties_data_modifier.py | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/release/scripts/startup/bl_ui/properties_data_modifier.py b/release/scripts/startup/bl_ui/properties_data_modifier.py index e90d1616929..df29f18853b 100644 --- a/release/scripts/startup/bl_ui/properties_data_modifier.py +++ b/release/scripts/startup/bl_ui/properties_data_modifier.py @@ -489,11 +489,13 @@ class DATA_PT_modifiers(ModifierButtonsPanel, Panel): col = split.column() col.prop(md, "time") - col.prop(md, "resolution") + col.prop(md, "depth") + col.prop(md, "random_seed") col = split.column() + col.prop(md, "resolution") + col.prop(md, "size") col.prop(md, "spatial_size") - col.prop(md, "depth") layout.label("Waves:") @@ -534,7 +536,7 @@ class DATA_PT_modifiers(ModifierButtonsPanel, Panel): if md.is_cached: layout.operator("object.ocean_bake", text="Free Bake").free = True else: - layout.operator("object.ocean_bake") + layout.operator("object.ocean_bake").free = False split = layout.split() split.enabled = not md.is_cached @@ -547,7 +549,15 @@ class DATA_PT_modifiers(ModifierButtonsPanel, Panel): col.label(text="Cache path:") col.prop(md, "filepath", text="") - #col.prop(md, "bake_foam_fade") + split = layout.split() + split.enabled = not md.is_cached + + col = split.column() + col.active = md.use_foam + col.prop(md, "bake_foam_fade") + + col = split.column() + def PARTICLE_INSTANCE(self, layout, ob, md): layout.prop(md, "object") |