Merged changes in the trunk up to revision 26260.
[blender-staging.git] / source / blender / blenkernel / intern / scene.c
index 703402c15e5e72fb0628ccb8e485a8cfeee5b283..14c786116ef2eb740b8440b1053e80b48ec8cb6f 100644 (file)
@@ -933,7 +933,7 @@ void scene_add_render_layer(Scene *sce)
 
 int get_render_subsurf_level(RenderData *r, int lvl)
 {
 
 int get_render_subsurf_level(RenderData *r, int lvl)
 {
-       if(G.rt == 1 && (r->mode & R_SIMPLIFY))
+       if(r->mode & R_SIMPLIFY)
                return MIN2(r->simplify_subsurf, lvl);
        else
                return lvl;
                return MIN2(r->simplify_subsurf, lvl);
        else
                return lvl;
@@ -941,7 +941,7 @@ int get_render_subsurf_level(RenderData *r, int lvl)
 
 int get_render_child_particle_number(RenderData *r, int num)
 {
 
 int get_render_child_particle_number(RenderData *r, int num)
 {
-       if(G.rt == 1 && (r->mode & R_SIMPLIFY))
+       if(r->mode & R_SIMPLIFY)
                return (int)(r->simplify_particles*num);
        else
                return num;
                return (int)(r->simplify_particles*num);
        else
                return num;
@@ -949,7 +949,7 @@ int get_render_child_particle_number(RenderData *r, int num)
 
 int get_render_shadow_samples(RenderData *r, int samples)
 {
 
 int get_render_shadow_samples(RenderData *r, int samples)
 {
-       if(G.rt == 1 && (r->mode & R_SIMPLIFY) && samples > 0)
+       if((r->mode & R_SIMPLIFY) && samples > 0)
                return MIN2(r->simplify_shadowsamples, samples);
        else
                return samples;
                return MIN2(r->simplify_shadowsamples, samples);
        else
                return samples;
@@ -957,7 +957,7 @@ int get_render_shadow_samples(RenderData *r, int samples)
 
 float get_render_aosss_error(RenderData *r, float error)
 {
 
 float get_render_aosss_error(RenderData *r, float error)
 {
-       if(G.rt == 1 && (r->mode & R_SIMPLIFY))
+       if(r->mode & R_SIMPLIFY)
                return ((1.0f-r->simplify_aosss)*10.0f + 1.0f)*error;
        else
                return error;
                return ((1.0f-r->simplify_aosss)*10.0f + 1.0f)*error;
        else
                return error;