[Bf-blender-cvs] [a139f27] fluid-mantaflow: removed outflow flow type

[Sebastián Barschkis]

Commit: a139f273b3433f4799c2b167bf01f412a14ae0a4
Author: Sebastián Barschkis
Date:   Wed Jul 27 01:08:41 2016 +0200
Branches: fluid-mantaflow
https://developer.blender.org/rBa139f273b3433f4799c2b167bf01f412a14ae0a4

removed outflow flow type

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

M	source/blender/makesdna/DNA_smoke_types.h
M	source/blender/makesrna/intern/rna_smoke.c

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

diff --git a/source/blender/makesdna/DNA_smoke_types.h b/source/blender/makesdna/DNA_smoke_types.h
index daffbfd..a95eb71 100644
--- a/source/blender/makesdna/DNA_smoke_types.h
+++ b/source/blender/makesdna/DNA_smoke_types.h
@@ -202,9 +202,8 @@ typedef struct SmokeDomainSettings {
 /* type */
 #define MOD_SMOKE_FLOW_TYPE_SMOKE 0
 #define MOD_SMOKE_FLOW_TYPE_FIRE 1
-#define MOD_SMOKE_FLOW_TYPE_OUTFLOW 2
-#define MOD_SMOKE_FLOW_TYPE_SMOKEFIRE 3
-#define MOD_SMOKE_FLOW_TYPE_LIQUID 4
+#define MOD_SMOKE_FLOW_TYPE_SMOKEFIRE 2
+#define MOD_SMOKE_FLOW_TYPE_LIQUID 3
 
 /* behavior */
 #define MOD_SMOKE_FLOW_BEHAVIOR_INFLOW 0
diff --git a/source/blender/makesrna/intern/rna_smoke.c b/source/blender/makesrna/intern/rna_smoke.c
index d1f29f1..180dbc9 100644
--- a/source/blender/makesrna/intern/rna_smoke.c
+++ b/source/blender/makesrna/intern/rna_smoke.c
@@ -817,7 +817,6 @@ static void rna_def_smoke_flow_settings(BlenderRNA *brna)
 	PropertyRNA *prop;
 
 	static EnumPropertyItem smoke_flow_types[] = {
-		{MOD_SMOKE_FLOW_TYPE_OUTFLOW, "OUTFLOW", 0, "Outflow", "Delete smoke from simulation"},
 		{MOD_SMOKE_FLOW_TYPE_SMOKE, "SMOKE", 0, "Smoke", "Add smoke"},
 		{MOD_SMOKE_FLOW_TYPE_SMOKEFIRE, "BOTH", 0, "Fire + Smoke", "Add fire and smoke"},
 		{MOD_SMOKE_FLOW_TYPE_FIRE, "FIRE", 0, "Fire", "Add fire"},