Commit: 31b9ddd87694e4ab475998c66d493729f12afb75
Author: Campbell Barton
Date:   Wed Dec 18 12:56:39 2019 +1100
Branches: master
https://developer.blender.org/rB31b9ddd87694e4ab475998c66d493729f12afb75

Fix error assigning the fluid particle flag to the wrong member

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

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

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

diff --git a/source/blender/blenkernel/intern/fluid.c 
b/source/blender/blenkernel/intern/fluid.c
index 42e8544d3c4..a22e552dc36 100644
--- a/source/blender/blenkernel/intern/fluid.c
+++ b/source/blender/blenkernel/intern/fluid.c
@@ -4287,7 +4287,7 @@ void BKE_fluid_particles_set(FluidDomainSettings 
*settings, int value, bool clea
     settings->particle_type &= ~value;
   }
   else {
-    settings->border_collisions |= value;
+    settings->particle_type |= value;
   }
 }

_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs

Reply via email to