blender
/
blender
129
397
Fork 571
Code Issues 6.2k Pull Requests 750 Projects 19 Wiki Activity

Merge remote-tracking branch 'origin/master' into blender2.8 

Explicitly undoing 287d1924fa here, as that was a master-only change.
This commit is contained in:
Sybren A. Stüvel 2018-04-18 12:27:31 +02:00
parent ea0630ade6 287d1924fa
commit 9b338e8028
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
source/blender/blenkernel/intern/particle.c
View File

@ -3540,10 +3540,17 @@ float psys_get_child_size(ParticleSystem *psys, ChildParticle *cpa, float UNUSED
ParticleSettings *part = psys->part;
float size; // time XXX
if (part->childtype == PART_CHILD_FACES)
size = part->size;
else
if (part->childtype == PART_CHILD_FACES) {
int w = 0;
size = 0.0;
while (w < 4 && cpa->pa[w] >= 0) {
size += cpa->w[w] * (psys->particles + cpa->pa[w])->size;
w++;
}
}
else {
size = psys->particles[cpa->parent].size;
}
size *= part->childsize;

2
source/blender/makesdna/intern/makesdna.c
View File

@ -464,7 +464,7 @@ static int preprocess_include(char *maindata, int len)
if (cp[0] == '/' && cp[1] == '/') {
comment = 1;
}
else if (*cp < 32) {
else if (*cp == '\n') {
comment = 0;
}
if (comment || *cp < 32 || *cp > 128) *cp = 32;