svn merge -r 16222:16320 https://svn.blender.org/svnroot/bf-blender/trunk/blender
[blender-staging.git] / source / blender / render / intern / source / convertblender.c
index 551006ffcc3bfec2acff33e072ac89a474d37bc4..0cf962052a36b19291d28d40ebb859b1d59c34cd 100644 (file)
@@ -1477,7 +1477,7 @@ static int render_new_particle_system(Render *re, ObjectRen *obr, ParticleSystem
        float hasize, pa_size, pa_time, r_tilt, cfra=bsystem_time(ob,(float)CFRA,0.0);
        float adapt_angle=0.0, adapt_pix=0.0, random, simplify[2];
        int i, a, k, max_k=0, totpart, totuv=0, totcol=0, override_uv=-1, dosimplify = 0, dosurfacecache = 0;
-       int path_possible=0, keys_possible=0, baked_keys=0, totchild=psys->totchild;
+       int path_possible=0, keys_possible=0, baked_keys=0, totchild=0;
        int seed, path_nbr=0, path=0, orco1=0, adapt=0, uv[3]={0,0,0}, num;
        int totface, *origindex = 0;
        char **uv_name=0;
@@ -1485,6 +1485,8 @@ static int render_new_particle_system(Render *re, ObjectRen *obr, ParticleSystem
 /* 1. check that everything is ok & updated */
        if(psys==NULL)
                return 0;
+       
+       totchild=psys->totchild;
 
        part=psys->part;
        pars=psys->particles;