Commit: 0f91dd6ce35b035c651465a93b20dbfadd280160
Author: Sebastián Barschkis
Date: Thu Jan 14 14:46:09 2016 +0100
Branches: fluid-mantaflow
https://developer.blender.org/rB0f91dd6ce35b035c651465a93b20dbfadd280160
ui updates
===================================================================
M release/scripts/startup/bl_ui/properties_physics_smoke.py
M source/blender/makesrna/intern/rna_smoke.c
===================================================================
diff --git a/release/scripts/startup/bl_ui/properties_physics_smoke.py
b/release/scripts/startup/bl_ui/properties_physics_smoke.py
index ee3f52b..516805e 100644
--- a/release/scripts/startup/bl_ui/properties_physics_smoke.py
+++ b/release/scripts/startup/bl_ui/properties_physics_smoke.py
@@ -446,7 +446,7 @@ class PHYSICS_PT_smoke_manta_settings(PhysicButtonsPanel,
Panel):
domain = context.smoke.domain_settings
split = layout.split()
split.prop(domain, "use_manta_liquid", text="Liquid")
- split.operator("manta_export_scene.button", text="Create Manta Setup")
+ split.operator("manta_export_scene.button", text="Export Mantaflow
Script")
split = layout.split()
split.prop(domain, "manta_filepath")
split = layout.split()
@@ -455,7 +455,7 @@ class PHYSICS_PT_smoke_manta_settings(PhysicButtonsPanel,
Panel):
col.prop(domain, "manta_uvs", text="UVs count")
split = layout.split()
col = split.column()
- col.label("Noise Settings")
+ col.label("Wavelet Noise")
col.prop(domain, "noise_clamp", text="Clamp")
sub = col.column()
sub.active = domain.noise_clamp
diff --git a/source/blender/makesrna/intern/rna_smoke.c
b/source/blender/makesrna/intern/rna_smoke.c
index a251344..2b2eee7 100644
--- a/source/blender/makesrna/intern/rna_smoke.c
+++ b/source/blender/makesrna/intern/rna_smoke.c
@@ -634,17 +634,19 @@ static void rna_def_smoke_domain_settings(BlenderRNA
*brna)
"Directory/name to save Mantaflow scene for
further simulations");
// RNA_def_property_update(prop, NC_OBJECT | ND_MODIFIER,
"rna_Smoke_manta_write_settings");
+ // Currently not used
// prop = RNA_def_property(srna, "use_manta_liquid", PROP_BOOLEAN,
PROP_NONE);
// RNA_def_property_boolean_sdna(prop, NULL, "flags",
MOD_SMOKE_MANTA_USE_LIQUID);
// RNA_def_property_ui_text(prop, "MantaFlow Liquid", "Use Mantaflow
liquid");
// RNA_def_property_update(prop, NC_OBJECT | ND_MODIFIER,
"rna_Smoke_reset");
- prop = RNA_def_property(srna, "manta_solver_res", PROP_INT, PROP_NONE);
- RNA_def_property_int_sdna(prop, NULL, "manta_solver_res");
- RNA_def_property_range(prop, 2, 3);
- RNA_def_property_ui_range(prop, 2, 3, 1, -1);
- RNA_def_property_ui_text(prop, "Solver Res", "Solver
resolution(2D/3D)");
- RNA_def_property_update(prop, NC_OBJECT | ND_MODIFIER,
"rna_Smoke_manta_switch2D");
+ // Currently not used
+// prop = RNA_def_property(srna, "manta_solver_res", PROP_INT, PROP_NONE);
+// RNA_def_property_int_sdna(prop, NULL, "manta_solver_res");
+// RNA_def_property_range(prop, 2, 3);
+// RNA_def_property_ui_range(prop, 2, 3, 1, -1);
+// RNA_def_property_ui_text(prop, "Solver Res", "Solver
resolution(2D/3D)");
+// RNA_def_property_update(prop, NC_OBJECT | ND_MODIFIER,
"rna_Smoke_manta_switch2D");
// prop = RNA_def_property(srna, "manta_sim_frame", PROP_INT, PROP_NONE);
// RNA_def_property_int_sdna(prop, NULL, "manta_sim_frame");
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
