diff options
author | Campbell Barton <ideasman42@gmail.com> | 2015-07-26 05:19:52 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2015-07-26 05:22:23 +0300 |
commit | c27a1cfd637827a3d802707262697fbb64aeb03f (patch) | |
tree | 7293562143bbd7c3a8229ad553a6073d029b6591 | |
parent | 88ebffec9677fb25a00fc73aef2c163d74736a55 (diff) |
Fix bug in particle API accessing the emitter
-rw-r--r-- | source/blender/editors/sculpt_paint/sculpt_undo.c | 2 | ||||
-rw-r--r-- | source/blender/makesrna/intern/rna_particle.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/editors/sculpt_paint/sculpt_undo.c b/source/blender/editors/sculpt_paint/sculpt_undo.c index c4556a5e145..1f1be51b9a6 100644 --- a/source/blender/editors/sculpt_paint/sculpt_undo.c +++ b/source/blender/editors/sculpt_paint/sculpt_undo.c @@ -279,7 +279,7 @@ static void sculpt_undo_bmesh_restore_generic(bContext *C, unode->applied = true; } - if (ELEM(unode->type, SCULPT_UNDO_MASK, SCULPT_UNDO_MASK)) { + if (unode->type == SCULPT_UNDO_MASK) { int i, totnode; PBVHNode **nodes; diff --git a/source/blender/makesrna/intern/rna_particle.c b/source/blender/makesrna/intern/rna_particle.c index c0ce8f21870..78631fdffc3 100644 --- a/source/blender/makesrna/intern/rna_particle.c +++ b/source/blender/makesrna/intern/rna_particle.c @@ -491,7 +491,7 @@ static int rna_ParticleSystem_tessfaceidx_on_emitter(ParticleSystem *particlesys num = cpa->num; if (part->childtype == PART_CHILD_FACES) { - if (ELEM(PART_FROM_FACE, PART_FROM_FACE, PART_FROM_VOLUME)) { + if (ELEM(part->from, PART_FROM_FACE, PART_FROM_VOLUME)) { if (num != DMCACHE_NOTFOUND && num < totface) { *r_fuv = &cpa->fuv; return num; |