[Bf-blender-cvs] [908dbedff32] fluid-mantaflow: fix legacy wturbulence

Sebastián Barschkis noreply at git.blender.org
Sat Mar 3 15:35:33 CET 2018


Commit: 908dbedff32896daf7cc99c99a570ffd9a214300
Author: Sebastián Barschkis
Date:   Sat Mar 3 15:35:16 2018 +0100
Branches: fluid-mantaflow
https://developer.blender.org/rB908dbedff32896daf7cc99c99a570ffd9a214300

fix legacy wturbulence

windows will not compile with issue - only warning on linux

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

M	source/blender/makesrna/intern/rna_smoke.c

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

diff --git a/source/blender/makesrna/intern/rna_smoke.c b/source/blender/makesrna/intern/rna_smoke.c
index d2d84fd3503..a00db6ac71b 100644
--- a/source/blender/makesrna/intern/rna_smoke.c
+++ b/source/blender/makesrna/intern/rna_smoke.c
@@ -746,8 +746,8 @@ static void rna_SmokeModifier_temperature_grid_get(PointerRNA *ptr, float *value
 
 	BLI_rw_mutex_lock(sds->fluid_mutex, THREAD_LOCK_READ);
 
-	if (sds->flags & MOD_SMOKE_HIGHRES && sds->wt) {
-		flame = smoke_turbulence_get_flame(sds->wt);
+	if (sds->flags & MOD_SMOKE_HIGHRES && sds->fluid) {
+		flame = smoke_turbulence_get_flame(sds->fluid);
 	}
 	else {
 		flame = smoke_get_flame(sds->fluid);



More information about the Bf-blender-cvs mailing list