[Bf-blender-cvs] [e96877c8b7f] fluid-mantaflow: Mantaflow: Flame vorticity fix

[Sebastián Barschkis]

Commit: e96877c8b7f18537240bf68a079934e6e7124775
Author: Sebastián Barschkis
Date:   Sun Dec 1 22:29:18 2019 +0100
Branches: fluid-mantaflow
https://developer.blender.org/rBe96877c8b7f18537240bf68a079934e6e7124775

Mantaflow: Flame vorticity fix

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

M	intern/mantaflow/intern/strings/smoke_script.h
M	source/blender/makesrna/intern/rna_manta.c

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

diff --git a/intern/mantaflow/intern/strings/smoke_script.h b/intern/mantaflow/intern/strings/smoke_script.h
index 3cdf26ff410..1c839fa6d52 100644
--- a/intern/mantaflow/intern/strings/smoke_script.h
+++ b/intern/mantaflow/intern/strings/smoke_script.h
@@ -359,7 +359,7 @@ def smoke_step_$ID$():\n\
     if using_fire_s$ID$:\n\
         flame_s$ID$.copyFrom(fuel_s$ID$) # temporarily misuse flame grid as vorticity storage\n\
         flame_s$ID$.multConst(flameVorticity_s$ID$)\n\
-    vorticityConfinement(vel=vel_s$ID$, flags=flags_s$ID$, strengthGlobal=vorticity_s$ID$, strengthCell=None if using_fire_s$ID$ else None)\n\
+    vorticityConfinement(vel=vel_s$ID$, flags=flags_s$ID$, strengthGlobal=vorticity_s$ID$, strengthCell=flame_s$ID$ if using_fire_s$ID$ else None)\n\
     \n\
     if using_heat_s$ID$:\n\
         mantaMsg('Adding heat buoyancy')\n\
diff --git a/source/blender/makesrna/intern/rna_manta.c b/source/blender/makesrna/intern/rna_manta.c
index ccbbefd4a60..e00d0e9f663 100644
--- a/source/blender/makesrna/intern/rna_manta.c
+++ b/source/blender/makesrna/intern/rna_manta.c
@@ -1470,7 +1470,7 @@ static void rna_def_manta_domain_settings(BlenderRNA *brna)
   RNA_def_property_ui_text(prop, "Smoke", "Amount of smoke created by burning fuel");
   RNA_def_property_update(prop, NC_OBJECT | ND_MODIFIER, "rna_Manta_resetCache");
 
-  prop = RNA_def_property(srna, "flame_vorticity", PROP_FLOAT, PROP_FACTOR);
+  prop = RNA_def_property(srna, "flame_vorticity", PROP_FLOAT, PROP_NONE);
   RNA_def_property_range(prop, 0.0, 2.0);
   RNA_def_property_ui_range(prop, 0.0, 1.0, 1.0, 5);
   RNA_def_property_ui_text(prop, "Vorticity", "Additional vorticity for the flames");