First new particle code:
[blender-staging.git] / source / blender / editors / space_view3d / drawobject.c
index 054cd4e966e813ada5d1feeab44baf8196c6f395..a67e8c8a1c32c9d039bc7bdc350f4da7778840f0 100644 (file)
@@ -3042,7 +3042,11 @@ static void draw_new_particle_system(Scene *scene, View3D *v3d, RegionView3D *rv
        }
 
        totpart=psys->totpart;
-       draw_as=part->draw_as;
+
+       if(part->draw_as==PART_DRAW_REND)
+               draw_as = part->ren_as;
+       else
+               draw_as = part->draw_as;
 
        if(part->flag&PART_GLOB_TIME)
                cfra=bsystem_time(scene, 0, (float)CFRA, 0.0f);
@@ -3489,7 +3493,6 @@ static void draw_new_particle_system(Scene *scene, View3D *v3d, RegionView3D *rv
                                glColorPointer(3, GL_FLOAT, 0, cdata);
                        }
 
-
                        /* draw created data arrays */
                        switch(draw_as){
                                case PART_DRAW_AXIS: