From ef1824cdcb9d78dd22316d48fd2d9c8bb6f41fa3 Mon Sep 17 00:00:00 2001 From: Daniel Genrich Date: Mon, 13 Jun 2011 00:02:23 +0000 Subject: Elbeem / Fluidsim: a) Also fixed an "upcomming" bug in regard of gravx,y,z now converted into an array. b) Little typo fix --- source/blender/editors/physics/physics_fluid.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source/blender/editors/physics') diff --git a/source/blender/editors/physics/physics_fluid.c b/source/blender/editors/physics/physics_fluid.c index d54048546fe..d54d608d2c7 100644 --- a/source/blender/editors/physics/physics_fluid.c +++ b/source/blender/editors/physics/physics_fluid.c @@ -443,7 +443,7 @@ static void fluid_init_all_channels(bContext *C, Object *UNUSED(fsDomain), Fluid for (fobj=fobjects->first; fobj; fobj=fobj->next) { Object *ob = fobj->object; FluidsimModifierData *fluidmd = (FluidsimModifierData *)modifiers_findByType(ob, eModifierType_Fluidsim); - float active= (float)(fluidmd->fss->flag && OB_FLUIDSIM_ACTIVE); + float active= (float)(fluidmd->fss->flag & OB_FLUIDSIM_ACTIVE); float rot_d[3] = {0.f, 0.f, 0.f}, old_rot[3] = {0.f, 0.f, 0.f}; if (ELEM(fluidmd->fss->type, OB_FLUIDSIM_DOMAIN, OB_FLUIDSIM_PARTICLE)) -- cgit v1.2.3