[Bf-blender-cvs] [6fd7125] fluid-mantaflow: another cleanup for viewport switch. removed old 'show high resolution' check-box.

[Sebastián Barschkis]

Commit: 6fd71252b70b2fc38738ea986a0ebbd0839148da
Author: Sebastián Barschkis
Date:   Fri Aug 12 16:06:09 2016 +0200
Branches: fluid-mantaflow
https://developer.blender.org/rB6fd71252b70b2fc38738ea986a0ebbd0839148da

another cleanup for viewport switch. removed old 'show high resolution' check-box.

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

M	release/scripts/startup/bl_ui/properties_physics_smoke.py
M	source/blender/blenkernel/intern/smoke.c
M	source/blender/editors/space_view3d/drawobject.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 db24492..d5109ba 100644
--- a/release/scripts/startup/bl_ui/properties_physics_smoke.py
+++ b/release/scripts/startup/bl_ui/properties_physics_smoke.py
@@ -306,7 +306,6 @@ class PHYSICS_PT_smoke_highres(PhysicButtonsPanel, Panel):
             sub.prop(domain, "amplify", text="Divisions")
             sub.label(text="Flow Sampling:")
             sub.row().prop(domain, "highres_sampling", text="")
-            sub.prop(domain, "show_high_resolution")
 
             sub = split.column()
             sub.active = domain.use_high_resolution
diff --git a/source/blender/blenkernel/intern/smoke.c b/source/blender/blenkernel/intern/smoke.c
index 2ffb00d..3417017 100644
--- a/source/blender/blenkernel/intern/smoke.c
+++ b/source/blender/blenkernel/intern/smoke.c
@@ -549,7 +549,9 @@ void smokeModifier_createType(struct SmokeModifierData *smd)
 			smd->domain->flame_smoke_color[1] = 0.7f;
 			smd->domain->flame_smoke_color[2] = 0.7f;
 
-			smd->domain->viewsettings = MOD_SMOKE_VIEW_SHOWBIG;
+			/* Deprecated */
+			smd->domain->viewsettings = NULL;
+			
 			smd->domain->effector_weights = BKE_add_effector_weights(NULL);
 			
 			smd->domain->viewport_display_mode = SM_VIEWPORT_PREVIEW;
diff --git a/source/blender/editors/space_view3d/drawobject.c b/source/blender/editors/space_view3d/drawobject.c
index 27e591b..b64c6ed 100644
--- a/source/blender/editors/space_view3d/drawobject.c
+++ b/source/blender/editors/space_view3d/drawobject.c
@@ -7943,21 +7943,13 @@ void draw_object(Scene *scene, ARegion *ar, View3D *v3d, Base *base, const short
 				if (sds->fluid && sds->viewport_display_mode == SM_VIEWPORT_GEOMETRY) {
 					// Nothing to do here
 				}
-#ifndef WITH_MANTA
-				else if (!sds->wt || !(sds->viewsettings & MOD_SMOKE_VIEW_SHOWBIG)) {
-#else
 				else if (!(sds->fluid && sds->flags & MOD_SMOKE_HIGHRES) || sds->viewport_display_mode == SM_VIEWPORT_PREVIEW) {
-#endif
 					sds->tex = NULL;
 					GPU_create_smoke(smd, 0);
 					draw_smoke_volume(sds, ob, p0, p1, viewnormal);
 					GPU_free_smoke(smd);
 				}
-#ifndef WITH_MANTA
-				else if (sds->wt && (sds->viewsettings & MOD_SMOKE_VIEW_SHOWBIG)) {
-#else
 				else if (sds->fluid && sds->flags & MOD_SMOKE_HIGHRES && sds->viewport_display_mode == SM_VIEWPORT_FINAL) {
-#endif
 					sds->tex = NULL;
 					GPU_create_smoke(smd, 1);
 					draw_smoke_volume(sds, ob, p0, p1, viewnormal);
diff --git a/source/blender/makesdna/DNA_smoke_types.h b/source/blender/makesdna/DNA_smoke_types.h
index b72ac11..1c418f5 100644
--- a/source/blender/makesdna/DNA_smoke_types.h
+++ b/source/blender/makesdna/DNA_smoke_types.h
@@ -54,8 +54,6 @@ enum {
 #define MOD_SMOKE_NOISEWAVE (1<<0)
 #define MOD_SMOKE_NOISEFFT (1<<1)
 #define MOD_SMOKE_NOISECURL (1<<2)
-/* viewsettings */
-#define MOD_SMOKE_VIEW_SHOWBIG (1<<0)
 
 /* cache compression */
 #define SM_CACHE_LIGHT		0
diff --git a/source/blender/makesrna/intern/rna_smoke.c b/source/blender/makesrna/intern/rna_smoke.c
index 9ce1764..69ff5fa 100644
--- a/source/blender/makesrna/intern/rna_smoke.c
+++ b/source/blender/makesrna/intern/rna_smoke.c
@@ -533,11 +533,6 @@ static void rna_def_smoke_domain_settings(BlenderRNA *brna)
 	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, "show_high_resolution", PROP_BOOLEAN, PROP_NONE);
-	RNA_def_property_boolean_sdna(prop, NULL, "viewsettings", MOD_SMOKE_VIEW_SHOWBIG);
-	RNA_def_property_ui_text(prop, "Show High Resolution", "Show high resolution (using amplification)");
-	RNA_def_property_update(prop, NC_OBJECT | ND_DRAW, NULL);
-
 	prop = RNA_def_property(srna, "noise_type", PROP_ENUM, PROP_NONE);
 	RNA_def_property_enum_sdna(prop, NULL, "noise");
 	RNA_def_property_enum_items(prop, prop_noise_type_items);
@@ -645,7 +640,7 @@ static void rna_def_smoke_domain_settings(BlenderRNA *brna)
 	RNA_def_property_enum_sdna(prop, NULL, "viewport_display_mode");
 	RNA_def_property_enum_items(prop, smoke_quality_items);
 	RNA_def_property_ui_text(prop, "Viewport Display Mode", "How to display the mesh in the viewport");
-	RNA_def_property_update(prop, 0, "rna_Smoke_update");
+	RNA_def_property_update(prop, NC_OBJECT | ND_DRAW, NULL);
 	
 	prop = RNA_def_property(srna, "render_display_mode", PROP_ENUM, PROP_NONE);
 	RNA_def_property_enum_sdna(prop, NULL, "render_display_mode");