Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJanne Karhu <jhkarh@gmail.com>2007-11-30 10:41:22 +0300
committerJanne Karhu <jhkarh@gmail.com>2007-11-30 10:41:22 +0300
commit04a009b047e13f6696b6780419b1561ef29c9854 (patch)
treebea9fa76182265c30e8fbfbb41bf24346b56ec80 /source/blender/render
parente893c9d739ed36a2d0aba50f231dba31cdcd2132 (diff)
Point cache was reset in many updates where it shouldn't have been reset.
Preview render crashed with "only render" children.
Diffstat (limited to 'source/blender/render')
-rw-r--r--source/blender/render/intern/source/convertblender.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/source/blender/render/intern/source/convertblender.c b/source/blender/render/intern/source/convertblender.c
index f64ff1501cb..c5044e4e334 100644
--- a/source/blender/render/intern/source/convertblender.c
+++ b/source/blender/render/intern/source/convertblender.c
@@ -1749,6 +1749,13 @@ static int render_new_particle_system(Render *re, Object *ob, ParticleSystem *ps
if(!(psmd->modifier.mode & eModifierMode_Render))
return 0;
+ if(G.rendering == 0) { /* preview render */
+ if(part->flag & PART_CHILD_RENDER)
+ totchild = 0;
+ else
+ totchild = (int)((float)totchild * (float)part->disp / 100.0f);
+ }
+
psys->flag|=PSYS_DRAWING;
BLI_srandom(psys->seed);