Commit: c27a1cfd637827a3d802707262697fbb64aeb03f
Author: Campbell Barton
Date: Sun Jul 26 12:19:52 2015 +1000
Branches: master
https://developer.blender.org/rBc27a1cfd637827a3d802707262697fbb64aeb03f
Fix bug in particle API accessing the emitter
===================================================================
M source/blender/editors/sculpt_paint/sculpt_undo.c
M source/blender/makesrna/intern/rna_particle.c
===================================================================
diff --git a/source/blender/editors/sculpt_paint/sculpt_undo.c
b/source/blender/editors/sculpt_paint/sculpt_undo.c
index c4556a5..1f1be51 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 c0ce8f2..78631fd 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;
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
