blender
/
blender
129
398
Fork 572
Code Issues 6.2k Pull Requests 749 Projects 19 Wiki Activity

Fix bug in particle API accessing the emitter

This commit is contained in:
Campbell Barton 2015-07-26 12:19:52 +10:00
parent 88ebffec96
commit c27a1cfd63
Notes: blender-bot 2023-02-14 10:37:50 +01:00 
Referenced by issue #45640, Toggle drag groups doesn't work
Referenced by issue #45575, CUDA error with Cmake build
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/editors/sculpt_paint/sculpt_undo.c
View File

@ -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;

2
source/blender/makesrna/intern/rna_particle.c
View File

@ -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;