diff options
author | Campbell Barton <ideasman42@gmail.com> | 2011-12-04 20:22:53 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2011-12-04 20:22:53 +0400 |
commit | 9c5ad4fb600e6b9be6bce448a141d59ce562382c (patch) | |
tree | c1881515350420b9972d69d5e3ff9981b42c314d /source/blender/render/intern | |
parent | 6c6b0ecb27101770bf09758701022c874b0170f5 (diff) |
remove old renderer struct member, was only used for setting yafray but was still being checked in a few places,
Diffstat (limited to 'source/blender/render/intern')
-rw-r--r-- | source/blender/render/intern/source/convertblender.c | 22 | ||||
-rw-r--r-- | source/blender/render/intern/source/pipeline.c | 6 |
2 files changed, 10 insertions, 18 deletions
diff --git a/source/blender/render/intern/source/convertblender.c b/source/blender/render/intern/source/convertblender.c index 00a53349141..d396522b8d0 100644 --- a/source/blender/render/intern/source/convertblender.c +++ b/source/blender/render/intern/source/convertblender.c @@ -1718,7 +1718,7 @@ static int render_new_particle_system(Render *re, ObjectRen *obr, ParticleSystem sd.adapt_angle = cosf(DEG2RADF((float)part->adapt_angle)); } - if(re->r.renderer==R_INTERN && part->draw&PART_DRAW_REN_STRAND) { + if (part->draw & PART_DRAW_REN_STRAND) { strandbuf= RE_addStrandBuffer(obr, (totpart+totchild)*(path_nbr+1)); strandbuf->ma= ma; strandbuf->lay= ob->lay; @@ -3872,8 +3872,9 @@ static GroupObject *add_render_lamp(Render *re, Object *ob) } } } - /* yafray: shadow flag should not be cleared, only used with internal renderer */ - if (re->r.renderer==R_INTERN) { + + /* old code checked for internal render (aka not yafray) */ + { /* to make sure we can check ray shadow easily in the render code */ if(lar->mode & LA_SHAD_RAY) { if( (re->r.mode & R_RAYTRACE)==0) @@ -5109,10 +5110,9 @@ void RE_Database_FromScene(Render *re, Main *bmain, Scene *scene, unsigned int l /* SHADOW BUFFER */ threaded_makeshadowbufs(re); - - /* yafray: 'direct' radiosity, environment maps and raytree init not needed for yafray render */ - /* although radio mode could be useful at some point, later */ - if (re->r.renderer==R_INTERN) { + + /* old code checked for internal render (aka not yafray) */ + { /* raytree */ if(!re->test_break(re->tbh)) { if(re->r.mode & R_RAYTRACE) { @@ -5137,14 +5137,12 @@ void RE_Database_FromScene(Render *re, Main *bmain, Scene *scene, unsigned int l /* Occlusion */ if((re->wrld.mode & (WO_AMB_OCC|WO_ENV_LIGHT|WO_INDIRECT_LIGHT)) && !re->test_break(re->tbh)) if(re->wrld.ao_gather_method == WO_AOGATHER_APPROX) - if(re->r.renderer==R_INTERN) - if(re->r.mode & R_SHADOW) - make_occ_tree(re); + if(re->r.mode & R_SHADOW) + make_occ_tree(re); /* SSS */ if((re->r.mode & R_SSS) && !re->test_break(re->tbh)) - if(re->r.renderer==R_INTERN) - make_sss_tree(re); + make_sss_tree(re); if(!re->test_break(re->tbh)) if(re->r.mode & R_RAYTRACE) diff --git a/source/blender/render/intern/source/pipeline.c b/source/blender/render/intern/source/pipeline.c index 52fb1eb48dc..0bad1a13a5a 100644 --- a/source/blender/render/intern/source/pipeline.c +++ b/source/blender/render/intern/source/pipeline.c @@ -2832,12 +2832,6 @@ int RE_is_rendering_allowed(Scene *scene, Object *camera_override, ReportList *r BKE_report(reports, RPT_ERROR, "All RenderLayers are disabled"); return 0; } - - /* renderer */ - if(!ELEM(scene->r.renderer, R_INTERN, R_YAFRAY)) { - BKE_report(reports, RPT_ERROR, "Unknown render engine set"); - return 0; - } return 1; } |