[Bf-blender-cvs] [855f164] fluid-mantaflow: removed preview resolution field. will not be needed

Sebastián Barschkis noreply at git.blender.org
Fri Aug 12 12:46:50 CEST 2016


Commit: 855f1647615b96e690e803782d13d21e4bfd923b
Author: Sebastián Barschkis
Date:   Thu Aug 11 15:45:56 2016 +0200
Branches: fluid-mantaflow
https://developer.blender.org/rB855f1647615b96e690e803782d13d21e4bfd923b

removed preview resolution field. will not be needed

===================================================================

M	release/scripts/startup/bl_ui/properties_physics_smoke.py
M	source/blender/blenkernel/intern/smoke.c
M	source/blender/makesdna/DNA_smoke_types.h
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 86d915c..4861bfb 100644
--- a/release/scripts/startup/bl_ui/properties_physics_smoke.py
+++ b/release/scripts/startup/bl_ui/properties_physics_smoke.py
@@ -253,13 +253,13 @@ class PHYSICS_PT_smoke_highres(PhysicButtonsPanel, Panel):
 
         col = split.column()
         col.label(text="Resolution:")
-        col.prop(domain, "resolution_max", text="Final")
+        col.prop(domain, "resolution_max", text="Divisions")
         col.label(text="Render Display:")
         col.prop(domain, "render_display_mode", text="")
 
         col = split.column()
         col.label()
-        col.prop(domain, "resolution_preview", text="Preview")
+        col.label()
         col.label(text="Viewport Display:")
         col.prop(domain, "viewport_display_mode", text="")
 
diff --git a/source/blender/blenkernel/intern/smoke.c b/source/blender/blenkernel/intern/smoke.c
index 60c53ff..fd00fd8 100644
--- a/source/blender/blenkernel/intern/smoke.c
+++ b/source/blender/blenkernel/intern/smoke.c
@@ -522,7 +522,6 @@ void smokeModifier_createType(struct SmokeModifierData *smd)
 			smd->domain->fluid_group = NULL;
 			smd->domain->coll_group = NULL;
 			smd->domain->maxres = 32;
-			smd->domain->previewres = 16;
 			smd->domain->amplify = 1;
 			smd->domain->alpha = -0.001;
 			smd->domain->beta = 0.3;
@@ -553,7 +552,7 @@ void smokeModifier_createType(struct SmokeModifierData *smd)
 			smd->domain->viewsettings = MOD_SMOKE_VIEW_SHOWBIG;
 			smd->domain->effector_weights = BKE_add_effector_weights(NULL);
 			
-			smd->domain->viewport_display_mode = SM_VIEWPORT_FINAL;
+			smd->domain->viewport_display_mode = SM_VIEWPORT_PREVIEW;
 			smd->domain->render_display_mode = SM_VIEWPORT_FINAL;
 			smd->domain->type = MOD_SMOKE_DOMAIN_TYPE_GAS;
 			
@@ -645,7 +644,6 @@ void smokeModifier_copy(struct SmokeModifierData *smd, struct SmokeModifierData
 		tsmd->domain->beta = smd->domain->beta;
 		tsmd->domain->amplify = smd->domain->amplify;
 		tsmd->domain->maxres = smd->domain->maxres;
-		tsmd->domain->previewres = smd->domain->previewres;
 		tsmd->domain->flags = smd->domain->flags;
 		tsmd->domain->highres_sampling = smd->domain->highres_sampling;
 		tsmd->domain->viewsettings = smd->domain->viewsettings;
diff --git a/source/blender/makesdna/DNA_smoke_types.h b/source/blender/makesdna/DNA_smoke_types.h
index 5085f32..69f911c 100644
--- a/source/blender/makesdna/DNA_smoke_types.h
+++ b/source/blender/makesdna/DNA_smoke_types.h
@@ -143,7 +143,6 @@ typedef struct SmokeDomainSettings {
 	float beta;
 	int amplify; /* wavelet amplification */
 	int maxres; /* longest axis on the BB gets this resolution assigned */
-	int previewres;
 	int flags; /* show up-res or low res, etc */
 	int viewsettings;
 	short noise; /* noise type: wave, curl, anisotropic */
@@ -159,7 +158,7 @@ typedef struct SmokeDomainSettings {
 	int openvdb_comp;
 	char cache_file_format;
 	char data_depth;
-	char pad[6];
+	char pad[2];
 	/* Liquid cache options */
 	int liquid_cache_comp;
 	char mock_pad[4]; /* unused */
diff --git a/source/blender/makesrna/intern/rna_smoke.c b/source/blender/makesrna/intern/rna_smoke.c
index 838486c..c39b7af 100644
--- a/source/blender/makesrna/intern/rna_smoke.c
+++ b/source/blender/makesrna/intern/rna_smoke.c
@@ -500,15 +500,7 @@ static void rna_def_smoke_domain_settings(BlenderRNA *brna)
 	RNA_def_property_int_sdna(prop, NULL, "maxres");
 	RNA_def_property_range(prop, 6, 512);
 	RNA_def_property_ui_range(prop, 24, 512, 2, -1);
-	RNA_def_property_ui_text(prop, "Max Res", "Domain resolution used in the fluid domain");
-	RNA_def_property_clear_flag(prop, PROP_ANIMATABLE);
-	RNA_def_property_update(prop, NC_OBJECT | ND_MODIFIER, "rna_Smoke_reset");
-	
-	prop = RNA_def_property(srna, "resolution_preview", PROP_INT, PROP_NONE);
-	RNA_def_property_int_sdna(prop, NULL, "previewres");
-	RNA_def_property_range(prop, 6, 128);
-	RNA_def_property_ui_range(prop, 24, 128, 2, -1);
-	RNA_def_property_ui_text(prop, "Max Res", "Preview resolution used in the fluid domain");
+	RNA_def_property_ui_text(prop, "Max Res", "Resolution used for the fluid domain");
 	RNA_def_property_clear_flag(prop, PROP_ANIMATABLE);
 	RNA_def_property_update(prop, NC_OBJECT | ND_MODIFIER, "rna_Smoke_reset");
 
@@ -516,7 +508,7 @@ static void rna_def_smoke_domain_settings(BlenderRNA *brna)
 	RNA_def_property_int_sdna(prop, NULL, "amplify");
 	RNA_def_property_range(prop, 1, 10);
 	RNA_def_property_ui_range(prop, 1, 10, 1, -1);
-	RNA_def_property_ui_text(prop, "Amplification", "Enhance the resolution of smoke by this factor using noise");
+	RNA_def_property_ui_text(prop, "Amplification", "Enhance the resolution of fluid domain by this factor");
 	RNA_def_property_clear_flag(prop, PROP_ANIMATABLE);
 	RNA_def_property_update(prop, NC_OBJECT | ND_MODIFIER, "rna_Smoke_reset");




More information about the Bf-blender-cvs mailing list