[Bf-blender-cvs] [30185113fdd] functions: take triangle areas into account

Jacques Lucke noreply at git.blender.org
Wed Sep 4 19:43:40 CEST 2019


Commit: 30185113fddfbc08a28099c17854e902817e8529
Author: Jacques Lucke
Date:   Wed Sep 4 15:28:40 2019 +0200
Branches: functions
https://developer.blender.org/rB30185113fddfbc08a28099c17854e902817e8529

take triangle areas into account

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

M	source/blender/simulations/bparticles/emitters.cpp

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

diff --git a/source/blender/simulations/bparticles/emitters.cpp b/source/blender/simulations/bparticles/emitters.cpp
index c1d3ee08a38..dcc7e2442f2 100644
--- a/source/blender/simulations/bparticles/emitters.cpp
+++ b/source/blender/simulations/bparticles/emitters.cpp
@@ -213,11 +213,6 @@ static BLI_NOINLINE void triangle_weights_from_vertex_weights(
   get_average_triangle_weights(mesh, triangles, vertex_weights, r_triangle_weights);
 }
 
-static BLI_NOINLINE void uniform_triangle_weights(MutableArrayRef<float> r_triangle_weights)
-{
-  r_triangle_weights.fill(1);
-}
-
 static BLI_NOINLINE bool sample_weighted_buckets(uint sample_amount,
                                                  ArrayRef<float> weights,
                                                  MutableArrayRef<uint> r_samples)
@@ -300,7 +295,7 @@ void SurfaceEmitter::emit(EmitterInterface &interface)
     triangle_weights_from_vertex_weights(m_object, m_density_group, triangles, triangle_weights);
   }
   else {
-    uniform_triangle_weights(triangle_weights);
+    compute_triangle_areas(mesh, triangles, triangle_weights);
   }
 
   TemporaryArray<uint> triangles_to_sample(particles_to_emit);



More information about the Bf-blender-cvs mailing list