[Bf-blender-cvs] [0ca08748b8e] fluid-mantaflow: set manta particle radius in particle system as well
Sebastián Barschkis
noreply at git.blender.org
Sat Jun 10 12:22:36 CEST 2017
Commit: 0ca08748b8e0ef2153f4072c4026a517783e8c53
Author: Sebastián Barschkis
Date: Sat Jun 10 10:55:08 2017 +0200
Branches: fluid-mantaflow
https://developer.blender.org/rB0ca08748b8e0ef2153f4072c4026a517783e8c53
set manta particle radius in particle system as well
===================================================================
M source/blender/blenkernel/intern/particle_system.c
===================================================================
diff --git a/source/blender/blenkernel/intern/particle_system.c b/source/blender/blenkernel/intern/particle_system.c
index ea394f61cba..385e1341d1d 100644
--- a/source/blender/blenkernel/intern/particle_system.c
+++ b/source/blender/blenkernel/intern/particle_system.c
@@ -3797,8 +3797,8 @@ static void particles_manta_step(ParticleSimulationData *sim, int UNUSED(cfra),
if (flagActivePart == 0) { // mantaflow convention: PNONE = 0 (regular, active particle)
activeParts++;
- pa->size = 0.1; // TODO (sebbas): manta doesnt store particle sizes -> new field in domainsettings
-// pa->size /= 10.0f;
+ pa->size = sds->particle_radius;
+ pa->size /= 10.0f;
float ob_loc[3] = {0};
float ob_cache_loc[3] = {0};
More information about the Bf-blender-cvs
mailing list