[Bf-blender-cvs] [16a5e32776a] temp-sybren-particles: FIXUP used wrong ob/psys

Sybren A. Stüvel noreply at git.blender.org
Wed May 16 12:53:41 CEST 2018


Commit: 16a5e32776ac3bb5226a72f0d3721da221e5bc01
Author: Sybren A. Stüvel
Date:   Wed May 16 12:35:58 2018 +0200
Branches: temp-sybren-particles
https://developer.blender.org/rB16a5e32776ac3bb5226a72f0d3721da221e5bc01

FIXUP used wrong ob/psys

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

M	source/blender/editors/physics/particle_edit.c

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

diff --git a/source/blender/editors/physics/particle_edit.c b/source/blender/editors/physics/particle_edit.c
index 499eb78ef84..b671fe08eee 100644
--- a/source/blender/editors/physics/particle_edit.c
+++ b/source/blender/editors/physics/particle_edit.c
@@ -1106,7 +1106,7 @@ void recalc_emitter_field(Depsgraph *depsgraph, Object *ob, ParticleSystem *psys
 {
 	Object *object_eval = DEG_get_evaluated_object(depsgraph, ob);
 	ParticleSystem *psys_eval = psys_eval_get(depsgraph, ob, psys);
-	Mesh *mesh = psys_get_modifier(ob, psys)->mesh_final;
+	Mesh *mesh = psys_get_modifier(object_eval, psys_eval)->mesh_final;
 	PTCacheEdit *edit = psys->edit;
 	float *vec, *nor;
 	int i, totface /*, totvert*/;



More information about the Bf-blender-cvs mailing list