diff options
| author | Sybren A. Stüvel <sybren@stuvel.eu> | 2018-04-18 13:27:31 +0300 |
|---|---|---|
| committer | Sybren A. Stüvel <sybren@stuvel.eu> | 2018-04-18 13:28:13 +0300 |
| commit | 9b338e802805bb7dbf981512923d6a1f343fbaa8 (patch) | |
| tree | bf30dd58f5668e6377526acd1be46bfb8ba7ec03 | |
| parent | ea0630ade6f4c54fe1077a362f03b891e69e4b72 (diff) | |
| parent | 287d1924fa149f0b52c75c387eac9d6621bb79bd (diff) | |
Merge remote-tracking branch 'origin/master' into blender2.8
Explicitly undoing 287d1924fa149f0 here, as that was a master-only change.
| -rw-r--r-- | source/blender/blenkernel/intern/particle.c | 13 | ||||
| -rw-r--r-- | source/blender/makesdna/intern/makesdna.c | 2 |
2 files changed, 11 insertions, 4 deletions
diff --git a/source/blender/blenkernel/intern/particle.c b/source/blender/blenkernel/intern/particle.c index e1e24a24245..07c8735f108 100644 --- a/source/blender/blenkernel/intern/particle.c +++ b/source/blender/blenkernel/intern/particle.c @@ -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; diff --git a/source/blender/makesdna/intern/makesdna.c b/source/blender/makesdna/intern/makesdna.c index d276e2c0859..a2c1e4d9463 100644 --- a/source/blender/makesdna/intern/makesdna.c +++ b/source/blender/makesdna/intern/makesdna.c @@ -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; |