Merging r58756 through r58777 from trunk into soc-2013-depsgraph_mt
[blender-staging.git] / source / blender / render / intern / source / convertblender.c
index 3087086764b6f297cb9acc0d972ca79d641585a0..a5b3572aa5b36fb58e5035409be20a714fd72fa6 100644 (file)
@@ -1741,7 +1741,7 @@ static int render_new_particle_system(Render *re, ObjectRen *obr, ParticleSystem
        }
 
        if (path_nbr == 0)
-               psys->lattice = psys_get_lattice(&sim);
+               psys->lattice_deform_data = psys_create_lattice_deform_data(&sim);
 
 /* 3. start creating renderable things */
        for (a=0, pa=pars; a<totpart+totchild; a++, pa++, seed++) {
@@ -2085,9 +2085,9 @@ static int render_new_particle_system(Render *re, ObjectRen *obr, ParticleSystem
 
        psys->flag &= ~PSYS_DRAWING;
 
-       if (psys->lattice) {
-               end_latt_deform(psys->lattice);
-               psys->lattice= NULL;
+       if (psys->lattice_deform_data) {
+               end_latt_deform(psys->lattice_deform_data);
+               psys->lattice_deform_data = NULL;
        }
 
        if (path_nbr && (ma->mode_l & MA_TANGENT_STR)==0)