diff options
author | Dalai Felinto <dfelinto@gmail.com> | 2017-11-14 21:32:13 +0300 |
---|---|---|
committer | Dalai Felinto <dfelinto@gmail.com> | 2017-11-22 12:13:33 +0300 |
commit | f15c63b0c2216fdebe559a0ed0f93765e6e763dc (patch) | |
tree | 60426da70bb7973c90e1733683ea0c6f4c7cd9cc /source/blender/render | |
parent | 9ce2370ce4f1e1e9bf14feaf56eee82bec9474ff (diff) |
SceneRenderLayer > SceneLayer: Remove light_override
Diffstat (limited to 'source/blender/render')
9 files changed, 0 insertions, 29 deletions
diff --git a/source/blender/render/extern/include/RE_pipeline.h b/source/blender/render/extern/include/RE_pipeline.h index f7d05b79a6c..89136da9749 100644 --- a/source/blender/render/extern/include/RE_pipeline.h +++ b/source/blender/render/extern/include/RE_pipeline.h @@ -112,7 +112,6 @@ typedef struct RenderLayer { int layflag, passflag, pass_xor; struct Material *mat_override; - struct Group *light_override; /* MULTIVIEW_TODO: acolrect and scolrect are not supported by multiview at the moment. * If they are really required they should be in RenderView instead */ diff --git a/source/blender/render/extern/include/RE_shader_ext.h b/source/blender/render/extern/include/RE_shader_ext.h index b64c0c8fc52..870e80257ea 100644 --- a/source/blender/render/extern/include/RE_shader_ext.h +++ b/source/blender/render/extern/include/RE_shader_ext.h @@ -179,7 +179,6 @@ typedef struct ShadeInput { unsigned int lay; int layflag, passflag, combinedflag; short object_pass_index; - struct Group *light_override; struct Material *mat_override; #ifdef RE_RAYCOUNTER diff --git a/source/blender/render/intern/source/convertblender.c b/source/blender/render/intern/source/convertblender.c index 608c182bd7b..6e0251c60cb 100644 --- a/source/blender/render/intern/source/convertblender.c +++ b/source/blender/render/intern/source/convertblender.c @@ -4030,16 +4030,6 @@ static void set_material_lightgroups(Render *re) } } -static void set_renderlayer_lightgroups(Render *re, Scene *sce) -{ - SceneRenderLayer *srl; - - for (srl= sce->r.layers.first; srl; srl= srl->next) { - if (srl->light_override) - add_lightgroup(re, srl->light_override, 0); - } -} - /* ------------------------------------------------------------------------- */ /* World */ /* ------------------------------------------------------------------------- */ @@ -5184,7 +5174,6 @@ static void database_init_objects(Render *re, unsigned int UNUSED(renderlay), in /* used to be 'rotate scene' */ void RE_Database_FromScene(Render *re, Main *bmain, Scene *scene, unsigned int lay, int use_camera_view) { - Scene *sce; Object *camera; float mat[4][4]; float amb[3]; @@ -5261,8 +5250,6 @@ void RE_Database_FromScene(Render *re, Main *bmain, Scene *scene, unsigned int l if (!re->test_break(re->tbh)) { set_material_lightgroups(re); - for (sce= re->scene; sce; sce= sce->set) - set_renderlayer_lightgroups(re, sce); /* for now some clumsy copying still */ re->i.totvert= re->totvert; diff --git a/source/blender/render/intern/source/rayshade.c b/source/blender/render/intern/source/rayshade.c index 2eb2e95308a..8b268f7d844 100644 --- a/source/blender/render/intern/source/rayshade.c +++ b/source/blender/render/intern/source/rayshade.c @@ -742,7 +742,6 @@ static void traceray(ShadeInput *origshi, ShadeResult *origshr, short depth, con shi.passflag= SCE_PASS_COMBINED; /* result of tracing needs no pass info */ shi.combinedflag= 0xFFFFFF; /* ray trace does all options */ //shi.do_preview = false; // memset above, so don't need this - shi.light_override= origshi->light_override; shi.mat_override= origshi->mat_override; shade_ray(&isec, &shi, &shr); diff --git a/source/blender/render/intern/source/render_result.c b/source/blender/render/intern/source/render_result.c index 5a14c4126bf..bc9bd60315e 100644 --- a/source/blender/render/intern/source/render_result.c +++ b/source/blender/render/intern/source/render_result.c @@ -318,7 +318,6 @@ RenderResult *render_result_new(Render *re, rcti *partrct, int crop, int savebuf rl->layflag = srl->layflag; rl->passflag = srl->passflag; /* for debugging: srl->passflag | SCE_PASS_RAYHITS; */ rl->pass_xor = srl->pass_xor; - rl->light_override = srl->light_override; rl->mat_override = srl->mat_override; rl->rectx = rectx; rl->recty = recty; diff --git a/source/blender/render/intern/source/rendercore.c b/source/blender/render/intern/source/rendercore.c index 77f399d08d1..fa6d6d42c6b 100644 --- a/source/blender/render/intern/source/rendercore.c +++ b/source/blender/render/intern/source/rendercore.c @@ -1661,7 +1661,6 @@ void zbufshade_sss_tile(RenderPart *pa) ssamp.shi[0].passflag |= SCE_PASS_RGBA|SCE_PASS_COMBINED; ssamp.shi[0].combinedflag &= ~(SCE_PASS_SPEC); ssamp.shi[0].mat_override= NULL; - ssamp.shi[0].light_override= NULL; lay= ssamp.shi[0].lay; /* create the pixelstrs to be used later */ diff --git a/source/blender/render/intern/source/shadeinput.c b/source/blender/render/intern/source/shadeinput.c index 660b82b884d..0e97a334420 100644 --- a/source/blender/render/intern/source/shadeinput.c +++ b/source/blender/render/intern/source/shadeinput.c @@ -1305,7 +1305,6 @@ void shade_input_initialize(ShadeInput *shi, RenderPart *pa, RenderLayer *rl, in shi->passflag = rl->passflag; shi->combinedflag = ~rl->pass_xor; shi->mat_override = rl->mat_override; - shi->light_override = rl->light_override; // shi->rl= rl; /* note shi.depth==0 means first hit, not raytracing */ diff --git a/source/blender/render/intern/source/shadeoutput.c b/source/blender/render/intern/source/shadeoutput.c index c5a666d52c9..9279899ef66 100644 --- a/source/blender/render/intern/source/shadeoutput.c +++ b/source/blender/render/intern/source/shadeoutput.c @@ -73,8 +73,6 @@ ListBase *get_lights(ShadeInput *shi) if (R.r.scemode & R_BUTS_PREVIEW) return &R.lights; - if (shi->light_override) - return &shi->light_override->gobject; if (shi->mat && shi->mat->group) return &shi->mat->group->gobject; @@ -2090,13 +2088,6 @@ float RE_lamp_get_data(ShadeInput *shi, Object *lamp_obj, float col[4], float lv return 0.0f; } - if (shi->light_override) { - for (go = shi->light_override->gobject.first; go; go = go->next) { - if (go->ob == lamp_obj) - return lamp_get_data_internal(shi, go, col, lv, dist, shadow); - } - } - if (shi->mat && shi->mat->group) { for (go = shi->mat->group->gobject.first; go; go = go->next) { if (go->ob == lamp_obj) diff --git a/source/blender/render/intern/source/volumetric.c b/source/blender/render/intern/source/volumetric.c index 7fe52328781..16fba22404a 100644 --- a/source/blender/render/intern/source/volumetric.c +++ b/source/blender/render/intern/source/volumetric.c @@ -172,7 +172,6 @@ static void shade_intersection(ShadeInput *shi, float col_r[4], Isect *is) shi_new.lay = shi->lay; shi_new.passflag = SCE_PASS_COMBINED; /* result of tracing needs no pass info */ shi_new.combinedflag = 0xFFFFFF; /* ray trace does all options */ - shi_new.light_override = shi->light_override; shi_new.mat_override = shi->mat_override; copy_v3_v3(shi_new.camera_co, is->start); |