remove old renderer struct member, was only used for setting yafray but was still...
authorCampbell Barton <ideasman42@gmail.com>
Sun, 4 Dec 2011 16:22:53 +0000 (16:22 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Sun, 4 Dec 2011 16:22:53 +0000 (16:22 +0000)
source/blender/blenloader/intern/readfile.c
source/blender/editors/object/object_bake.c
source/blender/makesdna/DNA_scene_types.h
source/blender/render/intern/source/convertblender.c
source/blender/render/intern/source/pipeline.c

index c80b062463d2fe39759f942d49edb00a35f0ef82..c72bc17cc1cbc3118e42a8768b2c8ec87a2541f8 100644 (file)
@@ -10403,13 +10403,6 @@ static void do_versions(FileData *fd, Library *lib, Main *main)
                        wrld->maxphystep = 5;
                }
        }
-
-       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
        if (main->versionfile < 249 && main->subversionfile < 1) {
index cf55a5317a551095e4c39af5ef71a9f35bd3d437..d1d41af1e50e208daeb4d2344de4e5027e42fa67 100644 (file)
@@ -1259,9 +1259,7 @@ static int test_bake_internal(bContext *C, ReportList *reports)
 {
        Scene *scene= CTX_data_scene(C);
 
-       if(scene->r.renderer!=R_INTERN) {
-               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) {
+       if((scene->r.bake_flag & R_BAKE_TO_ACTIVE) && CTX_data_active_object(C)==NULL) {
                BKE_report(reports, RPT_ERROR, "No active object");
        }
        else if(scene->r.bake_mode==RE_BAKE_AO && scene->world==NULL) {
index d8d3f05ce0167c0efafded51cf43fcba1ed402be..1b849754db84c3599d93c130ebc69fc2d46653ac 100644 (file)
@@ -389,8 +389,7 @@ typedef struct RenderData {
         */
        short raytrace_structure;
 
-       /* renderer (deprecated) */
-       short renderer  DNA_DEPRECATED;
+       short pad1;
 
        /* octree resolution */
        short ocres;
@@ -1036,10 +1035,6 @@ typedef struct Scene {
 #define R_FILTER_MITCH 6
 #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 */
 #define R_RAYSTRUCTURE_AUTO                            0
 #define R_RAYSTRUCTURE_OCTREE                  1
index 00a53349141346cc4611a6cff0e6945328bf7dcd..d396522b8d0963326cd1299890e41872d28376a3 100644 (file)
@@ -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)
index 52fb1eb48dc03dbc21cc31e7326e9ea94b8e3c1b..0bad1a13a5af47fad88b61a0ea074b10cfb39fc2 100644 (file)
@@ -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;
 }