Commit: b9ce69827921a4c1d8832d0edb0d60790f5d8802
Author: Sriharsha Kotcharlakot
Date: Mon Aug 17 19:21:25 2020 +0530
Branches: soc-2020-fluid-tools
https://developer.blender.org/rBb9ce69827921a4c1d8832d0edb0d60790f5d8802
Cleanup: Minor refactoring and naming updates
===================================================================
M release/scripts/startup/bl_ui/properties_physics_fluid.py
M source/blender/draw/engines/workbench/workbench_volume.c
M source/blender/makesrna/intern/rna_fluid.c
===================================================================
diff --git a/release/scripts/startup/bl_ui/properties_physics_fluid.py
b/release/scripts/startup/bl_ui/properties_physics_fluid.py
index 216890a5ef1..456d059024a 100644
--- a/release/scripts/startup/bl_ui/properties_physics_fluid.py
+++ b/release/scripts/startup/bl_ui/properties_physics_fluid.py
@@ -1277,7 +1277,7 @@ class PHYSICS_PT_viewport_display(PhysicButtonsPanel,
Panel):
col.prop(domain, "slice_axis")
col.prop(domain, "slice_depth")
if domain.display_interpolation == "CLOSEST" or domain.coba_field
== "FLAGS":
- col.prop(domain, "show_gridlines", text="Show Gridlines")
+ col.prop(domain, "show_gridlines")
col = col.column()
col.active = do_full_slicing
@@ -1341,7 +1341,6 @@ class
PHYSICS_PT_viewport_display_debug(PhysicButtonsPanel, Panel):
col = flow.column()
col.active = domain.show_velocity
col.prop(domain, "vector_display_type", text="Display As")
- col.prop(domain, "vector_field", text="Field")
if not domain.use_guide and domain.vector_field == 'GUIDE_VELOCITY':
note = layout.split()
@@ -1355,6 +1354,7 @@ class
PHYSICS_PT_viewport_display_debug(PhysicButtonsPanel, Panel):
else:
col.prop(domain, "vector_scale_with_magnitude")
+ col.prop(domain, "vector_field")
col.prop(domain, "vector_scale")
class PHYSICS_PT_viewport_display_advanced(PhysicButtonsPanel, Panel):
diff --git a/source/blender/draw/engines/workbench/workbench_volume.c
b/source/blender/draw/engines/workbench/workbench_volume.c
index 8ca9ac0ece5..07d02307f65 100644
--- a/source/blender/draw/engines/workbench/workbench_volume.c
+++ b/source/blender/draw/engines/workbench/workbench_volume.c
@@ -82,6 +82,9 @@ static void
workbench_volume_modifier_cache_populate(WORKBENCH_Data *vedata,
else if (fds->type == FLUID_DOMAIN_TYPE_GAS) {
DRW_smoke_ensure(fmd, fds->flags & FLUID_DOMAIN_USE_NOISE);
}
+ else {
+ return;
+ }
if ((!fds->use_coba && (fds->tex_density == NULL && fds->tex_color == NULL))
||
(fds->use_coba && fds->tex_field == NULL)) {
diff --git a/source/blender/makesrna/intern/rna_fluid.c
b/source/blender/makesrna/intern/rna_fluid.c
index efabe3a1265..928cf200671 100644
--- a/source/blender/makesrna/intern/rna_fluid.c
+++ b/source/blender/makesrna/intern/rna_fluid.c
@@ -2496,8 +2496,7 @@ static void rna_def_fluid_domain_settings(BlenderRNA
*brna)
prop = RNA_def_property(srna, "show_velocity", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, NULL, "draw_velocity", 0);
- RNA_def_property_ui_text(
- prop, "Display Velocity", "Toggle visualization of the velocity field as
needles");
+ RNA_def_property_ui_text(prop, "Vector Display", "Visualize vector fields");
RNA_def_property_update(prop, NC_OBJECT | ND_DRAW, NULL);
prop = RNA_def_property(srna, "vector_display_type", PROP_ENUM, PROP_NONE);
@@ -2544,10 +2543,10 @@ static void rna_def_fluid_domain_settings(BlenderRNA
*brna)
prop = RNA_def_property(srna, "use_color_ramp", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, NULL, "use_coba", 0);
RNA_def_property_boolean_funcs(prop, NULL, "rna_Fluid_use_color_ramp_set");
- RNA_def_property_ui_text(
- prop,
- "Use Color Ramp",
- "Render a simulation field while mapping its voxels values to the colors
of a ramp");
+ RNA_def_property_ui_text(prop,
+ "Grid Display",
+ "Render a simulation field while mapping its voxels
values to the "
+ "colors of a ramp or using a predefined color
code");
RNA_def_property_update(prop, NC_OBJECT | ND_DRAW, NULL);
/* Coba field items - generated dynamically based on domain type */
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
