[Bf-blender-cvs] [465e59a] cycles_memory_experiments: Smoke: Fix wrong bit test in previous commit

Sergey Sharybin noreply at git.blender.org
Wed Apr 15 20:11:31 CEST 2015


Commit: 465e59ac7d4534858447c3b83e009a4058ca3e2c
Author: Sergey Sharybin
Date:   Wed Apr 15 22:50:39 2015 +0500
Branches: cycles_memory_experiments
https://developer.blender.org/rB465e59ac7d4534858447c3b83e009a4058ca3e2c

Smoke: Fix wrong bit test in previous commit

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

M	source/blender/blenkernel/intern/smoke.c

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

diff --git a/source/blender/blenkernel/intern/smoke.c b/source/blender/blenkernel/intern/smoke.c
index 3152cdb..41bf2e3 100644
--- a/source/blender/blenkernel/intern/smoke.c
+++ b/source/blender/blenkernel/intern/smoke.c
@@ -196,7 +196,8 @@ void smoke_reallocate_highres_fluid(SmokeDomainSettings *sds, float dx, int res[
 {
 	int use_fire = (sds->active_fields & (SM_ACTIVE_HEAT | SM_ACTIVE_FIRE));
 	int use_colors = (sds->active_fields & SM_ACTIVE_COLORS);
-	int use_sim = !(sds->point_cache[0] && (sds->point_cache[0]->flag & (PTCACHE_BAKED|PTCACHE_DISK_CACHE)));
+	int use_sim = !((sds->point_cache[0] != NULL) &&
+	                (sds->point_cache[0]->flag & (PTCACHE_BAKED|PTCACHE_DISK_CACHE)) == (PTCACHE_BAKED|PTCACHE_DISK_CACHE));
 
 	if (free_old && sds->wt)
 		smoke_turbulence_free(sds->wt);




More information about the Bf-blender-cvs mailing list