remove old renderer struct member, was only used for setting yafray but was still being checked in a few places,
This commit is contained in:
@@ -10404,13 +10404,6 @@ static void do_versions(FileData *fd, Library *lib, Main *main)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (main->versionfile < 249) {
|
|
||||||
Scene *sce;
|
|
||||||
for (sce= main->scene.first; sce; sce= sce->id.next)
|
|
||||||
sce->r.renderer= 0;
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
// correct introduce of seed for wind force
|
// correct introduce of seed for wind force
|
||||||
if (main->versionfile < 249 && main->subversionfile < 1) {
|
if (main->versionfile < 249 && main->subversionfile < 1) {
|
||||||
Object *ob;
|
Object *ob;
|
||||||
|
|||||||
@@ -1259,9 +1259,7 @@ static int test_bake_internal(bContext *C, ReportList *reports)
|
|||||||
{
|
{
|
||||||
Scene *scene= CTX_data_scene(C);
|
Scene *scene= CTX_data_scene(C);
|
||||||
|
|
||||||
if(scene->r.renderer!=R_INTERN) {
|
if((scene->r.bake_flag & R_BAKE_TO_ACTIVE) && CTX_data_active_object(C)==NULL) {
|
||||||
BKE_report(reports, RPT_ERROR, "Bake only supported for Internal Renderer");
|
|
||||||
} else if((scene->r.bake_flag & R_BAKE_TO_ACTIVE) && CTX_data_active_object(C)==NULL) {
|
|
||||||
BKE_report(reports, RPT_ERROR, "No active object");
|
BKE_report(reports, RPT_ERROR, "No active object");
|
||||||
}
|
}
|
||||||
else if(scene->r.bake_mode==RE_BAKE_AO && scene->world==NULL) {
|
else if(scene->r.bake_mode==RE_BAKE_AO && scene->world==NULL) {
|
||||||
|
|||||||
@@ -389,8 +389,7 @@ typedef struct RenderData {
|
|||||||
*/
|
*/
|
||||||
short raytrace_structure;
|
short raytrace_structure;
|
||||||
|
|
||||||
/* renderer (deprecated) */
|
short pad1;
|
||||||
short renderer DNA_DEPRECATED;
|
|
||||||
|
|
||||||
/* octree resolution */
|
/* octree resolution */
|
||||||
short ocres;
|
short ocres;
|
||||||
@@ -1036,10 +1035,6 @@ typedef struct Scene {
|
|||||||
#define R_FILTER_MITCH 6
|
#define R_FILTER_MITCH 6
|
||||||
#define R_FILTER_FAST_GAUSS 7 /* note, this is only used for nodes at the moment */
|
#define R_FILTER_FAST_GAUSS 7 /* note, this is only used for nodes at the moment */
|
||||||
|
|
||||||
/* yafray: renderer flag (not only exclusive to yafray) */
|
|
||||||
#define R_INTERN 0
|
|
||||||
#define R_YAFRAY 1
|
|
||||||
|
|
||||||
/* raytrace structure */
|
/* raytrace structure */
|
||||||
#define R_RAYSTRUCTURE_AUTO 0
|
#define R_RAYSTRUCTURE_AUTO 0
|
||||||
#define R_RAYSTRUCTURE_OCTREE 1
|
#define R_RAYSTRUCTURE_OCTREE 1
|
||||||
|
|||||||
@@ -1718,7 +1718,7 @@ static int render_new_particle_system(Render *re, ObjectRen *obr, ParticleSystem
|
|||||||
sd.adapt_angle = cosf(DEG2RADF((float)part->adapt_angle));
|
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= RE_addStrandBuffer(obr, (totpart+totchild)*(path_nbr+1));
|
||||||
strandbuf->ma= ma;
|
strandbuf->ma= ma;
|
||||||
strandbuf->lay= ob->lay;
|
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 */
|
/* to make sure we can check ray shadow easily in the render code */
|
||||||
if(lar->mode & LA_SHAD_RAY) {
|
if(lar->mode & LA_SHAD_RAY) {
|
||||||
if( (re->r.mode & R_RAYTRACE)==0)
|
if( (re->r.mode & R_RAYTRACE)==0)
|
||||||
@@ -5110,9 +5111,8 @@ void RE_Database_FromScene(Render *re, Main *bmain, Scene *scene, unsigned int l
|
|||||||
/* SHADOW BUFFER */
|
/* SHADOW BUFFER */
|
||||||
threaded_makeshadowbufs(re);
|
threaded_makeshadowbufs(re);
|
||||||
|
|
||||||
/* yafray: 'direct' radiosity, environment maps and raytree init not needed for yafray render */
|
/* old code checked for internal render (aka not yafray) */
|
||||||
/* although radio mode could be useful at some point, later */
|
{
|
||||||
if (re->r.renderer==R_INTERN) {
|
|
||||||
/* raytree */
|
/* raytree */
|
||||||
if(!re->test_break(re->tbh)) {
|
if(!re->test_break(re->tbh)) {
|
||||||
if(re->r.mode & R_RAYTRACE) {
|
if(re->r.mode & R_RAYTRACE) {
|
||||||
@@ -5137,13 +5137,11 @@ void RE_Database_FromScene(Render *re, Main *bmain, Scene *scene, unsigned int l
|
|||||||
/* Occlusion */
|
/* Occlusion */
|
||||||
if((re->wrld.mode & (WO_AMB_OCC|WO_ENV_LIGHT|WO_INDIRECT_LIGHT)) && !re->test_break(re->tbh))
|
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->wrld.ao_gather_method == WO_AOGATHER_APPROX)
|
||||||
if(re->r.renderer==R_INTERN)
|
|
||||||
if(re->r.mode & R_SHADOW)
|
if(re->r.mode & R_SHADOW)
|
||||||
make_occ_tree(re);
|
make_occ_tree(re);
|
||||||
|
|
||||||
/* SSS */
|
/* SSS */
|
||||||
if((re->r.mode & R_SSS) && !re->test_break(re->tbh))
|
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->test_break(re->tbh))
|
||||||
|
|||||||
@@ -2833,12 +2833,6 @@ int RE_is_rendering_allowed(Scene *scene, Object *camera_override, ReportList *r
|
|||||||
return 0;
|
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;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user