Cleanup: remove old preview code
authorCampbell Barton <ideasman42@gmail.com>
Mon, 6 Oct 2014 10:36:50 +0000 (12:36 +0200)
committerCampbell Barton <ideasman42@gmail.com>
Mon, 6 Oct 2014 12:08:41 +0000 (14:08 +0200)
source/blender/blenkernel/intern/scene.c
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/versioning_250.c
source/blender/editors/include/ED_render.h
source/blender/editors/render/render_preview.c
source/blender/editors/space_view3d/space_view3d.c
source/blender/makesdna/DNA_space_types.h
source/blender/makesdna/DNA_view3d_types.h

index 67b00a8c137e2f1dde61dd2fabdc4adbb10b9ea2..5bfd6e8a1201a03dbc65bad92cd82eb105058977 100644 (file)
@@ -93,9 +93,6 @@
 
 #include "bmesh.h"
 
-//XXX #include "BIF_previewrender.h"
-//XXX #include "BIF_editseq.h"
-
 #ifdef WIN32
 #else
 #  include <sys/time.h>
index 7aadf4a51ea5d00a1d03d9143805290755ca10b9..aea3596326903b2e293387c63d57338cb3409537 100644 (file)
@@ -6238,7 +6238,6 @@ static void direct_link_region(FileData *fd, ARegion *ar, int spacetype)
 
                                rv3d->depths = NULL;
                                rv3d->gpuoffscreen = NULL;
-                               rv3d->ri = NULL;
                                rv3d->render_engine = NULL;
                                rv3d->sms = NULL;
                                rv3d->smooth_timer = NULL;
index 06d871c8db046585d078e8f03d0bbb220d262f20..40b756a3f7cc4e55b5aa86360d66be9b9d75732b 100644 (file)
@@ -89,9 +89,6 @@
 
 #include "NOD_socket.h"
 
-//XXX #include "BIF_butspace.h" // badlevel, for do_versions, patching event codes
-//XXX #include "BIF_filelist.h" // badlevel too, where to move this? - elubie
-//XXX #include "BIF_previewrender.h" // bedlelvel, for struct RenderInfo
 #include "BLO_readfile.h"
 #include "BLO_undofile.h"
 
index 14595a4c668fd6a05fc71e5f96c258416019e8b0..ab1dbabe793fbfce6e9c21c7faed48cf9d71825c 100644 (file)
@@ -35,7 +35,6 @@ struct ID;
 struct Main;
 struct MTex;
 struct Render;
-struct RenderInfo;
 struct Scene;
 struct ScrArea;
 struct RegionView3D;
@@ -56,18 +55,6 @@ void ED_render_scene_update(struct Main *bmain, struct Scene *scene, int updated
 void ED_viewport_render_kill_jobs(const struct bContext *C, bool free_database);
 struct Scene *ED_render_job_get_scene(const struct bContext *C);
 
-/* render_preview.c */
-
-/* stores rendered preview  - is also used for icons */
-typedef struct RenderInfo {
-       int pr_rectx;
-       int pr_recty;
-       short curtile, tottile;
-       rcti disprect;          /* storage for view3d preview rect */
-       unsigned int *rect;
-       struct Render *re;      /* persistent render */
-} RenderInfo;
-
 /* Render the preview
  *
  * pr_method:
index 01f00a8458a226bbc4f21da5faad372b1c9a0b4a..70c9e3c43069b12f5e8d764ba017a439687d0243 100644 (file)
@@ -751,12 +751,6 @@ static void shader_preview_render(ShaderPreview *sp, ID *id, int split, int firs
                if (sp->pr_rect)
                        RE_ResultGet32(re, sp->pr_rect);
        }
-       else {
-               /* validate owner */
-               //if (ri->rect == NULL)
-               //      ri->rect= MEM_mallocN(sizeof(int) * ri->pr_rectx*ri->pr_recty, "BIF_previewrender");
-               //RE_ResultGet32(re, ri->rect);
-       }
 
        /* unassign the pointers, reset vars */
        preview_prepare_scene(sp->scene, NULL, GS(id->name), sp);
index 8b76ec3a56de9917da09ad1112599bac13e97717..0e3621aa91fc005cf792fac36949657ffdfdb65b 100644 (file)
@@ -698,10 +698,6 @@ static void view3d_main_area_free(ARegion *ar)
                if (rv3d->localvd) MEM_freeN(rv3d->localvd);
                if (rv3d->clipbb) MEM_freeN(rv3d->clipbb);
 
-               if (rv3d->ri) {
-                       // XXX          BIF_view3d_previewrender_free(rv3d);
-               }
-
                if (rv3d->render_engine)
                        RE_engine_free(rv3d->render_engine);
                
@@ -735,7 +731,6 @@ static void *view3d_main_area_duplicate(void *poin)
                
                new->depths = NULL;
                new->gpuoffscreen = NULL;
-               new->ri = NULL;
                new->render_engine = NULL;
                new->sms = NULL;
                new->smooth_timer = NULL;
index 6f57f549efb918c5da8ae6ae96ad1bd248ef6311..a267217abf618d9d282723e6cd3afaa8c1382163 100644 (file)
@@ -57,7 +57,6 @@ struct Scopes;
 struct Histogram;
 struct SpaceIpo;
 struct BlendHandle;
-struct RenderInfo;
 struct bNodeTree;
 struct uiBlock;
 struct FileList;
index 98c12e9cc11c56cbed72f1e12ac295db65267c8b..3efba4882990dbeca6e3d3e85dea0f12f4223bec 100644 (file)
@@ -41,7 +41,6 @@ struct Base;
 struct BoundBox;
 struct MovieClip;
 struct MovieClipUser;
-struct RenderInfo;
 struct RenderEngine;
 struct bGPdata;
 struct SmoothView3DStore;
@@ -102,7 +101,6 @@ typedef struct RegionView3D {
        struct BoundBox *clipbb;
 
        struct RegionView3D *localvd; /* allocated backup of its self while in localview */
-       struct RenderInfo *ri;
        struct RenderEngine *render_engine;
        struct ViewDepths *depths;
        void *gpuoffscreen;