[Bf-blender-cvs] [25b7d8a] fluid-mantaflow: renamed viewport mode switcher variables

[Sebastián Barschkis]

Commit: 25b7d8a8ad872c7f8c4262648d2dc26d68db377a
Author: Sebastián Barschkis
Date:   Fri Jul 15 12:39:21 2016 +0200
Branches: fluid-mantaflow
https://developer.blender.org/rB25b7d8a8ad872c7f8c4262648d2dc26d68db377a

renamed viewport mode switcher variables

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

M	release/scripts/addons
M	release/scripts/addons_contrib
M	release/scripts/startup/bl_ui/properties_physics_smoke.py
M	source/blender/makesdna/DNA_smoke_types.h
M	source/blender/makesrna/intern/rna_smoke.c

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

diff --git a/release/scripts/addons b/release/scripts/addons
index 70a8890..7e05091 160000
--- a/release/scripts/addons
+++ b/release/scripts/addons
@@ -1 +1 @@
-Subproject commit 70a889052ee519b5a1f77edff569d76e104c6c7f
+Subproject commit 7e05091168f0b1bb01c4164dcfeb80be7b2318b4
diff --git a/release/scripts/addons_contrib b/release/scripts/addons_contrib
index 7c42b48..afb4e53 160000
--- a/release/scripts/addons_contrib
+++ b/release/scripts/addons_contrib
@@ -1 +1 @@
-Subproject commit 7c42b4803b8b044a7ea6126011596c97b42afb71
+Subproject commit afb4e53115ce9396db09228b38bb82cf4c7eb00d
diff --git a/release/scripts/startup/bl_ui/properties_physics_smoke.py b/release/scripts/startup/bl_ui/properties_physics_smoke.py
index e889350..77dc9eb 100644
--- a/release/scripts/startup/bl_ui/properties_physics_smoke.py
+++ b/release/scripts/startup/bl_ui/properties_physics_smoke.py
@@ -70,7 +70,7 @@ class PHYSICS_PT_fluid(PhysicButtonsPanel, Panel):
             col.label(text="Border Collisions:")
             col.prop(domain, "collision_extents", text="")
             col.label(text="Viewport Display:")
-            col.prop(domain, "viewport_display", text="")
+            col.prop(domain, "viewport_mode", text="")
 
         elif md.smoke_type == 'FLOW':
             flow = md.flow_settings
diff --git a/source/blender/makesdna/DNA_smoke_types.h b/source/blender/makesdna/DNA_smoke_types.h
index 68fb62d..daffbfd 100644
--- a/source/blender/makesdna/DNA_smoke_types.h
+++ b/source/blender/makesdna/DNA_smoke_types.h
@@ -168,8 +168,12 @@ typedef struct SmokeDomainSettings {
 	struct ListBase ptcaches[2];
 	struct EffectorWeights *effector_weights;
 	int border_collisions;	/* How domain border collisions are handled */
-	int viewport_display;	/* How to display mesh in viewport */
+	
+	/* show original meshes, preview or final sim */
+	short viewport_mode;
+	short render_mode;
 	char pad2[4];
+	
 	float time_scale;
 	float vorticity;
 	int active_fields;
diff --git a/source/blender/makesrna/intern/rna_smoke.c b/source/blender/makesrna/intern/rna_smoke.c
index a7ccf7a..d1f29f1 100644
--- a/source/blender/makesrna/intern/rna_smoke.c
+++ b/source/blender/makesrna/intern/rna_smoke.c
@@ -623,10 +623,11 @@ static void rna_def_smoke_domain_settings(BlenderRNA *brna)
 	                         "Select which domain border will be treated as collision object");
 	RNA_def_property_update(prop, NC_OBJECT | ND_MODIFIER, "rna_Smoke_reset");
 	
-	prop = RNA_def_property(srna, "viewport_display", PROP_ENUM, PROP_NONE);
-	RNA_def_property_enum_sdna(prop, NULL, "viewport_display");
+	prop = RNA_def_property(srna, "viewport_mode", PROP_ENUM, PROP_NONE);
+	RNA_def_property_enum_sdna(prop, NULL, "viewport_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");
 
 	prop = RNA_def_property(srna, "effector_weights", PROP_POINTER, PROP_NONE);
 	RNA_def_property_struct_type(prop, "EffectorWeights");