blender
/
blender
130
398
Fork 574
Code Issues 6.2k Pull Requests 751 Projects 19 Wiki Activity

Freestyle: Removed debugging code (use G.main instead of Freestyle-local struct Main).

This commit is contained in:
Tamito Kajiyama 2014-07-21 19:41:11 +09:00
parent f7d3f2b228
commit b606520791
2 changed files with 0 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp
View File

@ -156,10 +156,6 @@ BlenderStrokeRenderer::BlenderStrokeRenderer(bContext *C, Render *re, int render
BlenderStrokeRenderer::~BlenderStrokeRenderer()
{
#if 0
return; // XXX
#endif
// The freestyle_scene object is not released here. Instead,
// the scene is released in free_all_freestyle_renders() in
// source/blender/render/intern/source/pipeline.c, after the

8
source/blender/render/intern/source/pipeline.c
View File

@ -1940,7 +1940,6 @@ static void add_freestyle(Render *re, int render)
actsrl = BLI_findlink(&re->r.layers, re->r.actlay);
#if 1
re->freestyle_bmain = BKE_main_new();
/* We use the same window manager for freestyle bmain as
@ -1951,9 +1950,6 @@ static void add_freestyle(Render *re, int render)
* to present (sergey)
*/
re->freestyle_bmain->wm = re->main->wm;
#else
re->freestyle_bmain = G.main;
#endif
FRS_init_stroke_rendering(re);
@ -2020,22 +2016,18 @@ static void free_all_freestyle_renders(void)
if (freestyle_render) {
freestyle_scene = freestyle_render->scene;
RE_FreeRender(freestyle_render);
#if 1
BKE_scene_unlink(re1->freestyle_bmain, freestyle_scene, NULL);
#endif
}
}
BLI_freelistN(&re1->freestyle_renders);
if (re1->freestyle_bmain) {
#if 1
/* detach the window manager from freestyle bmain (see comments
* in add_freestyle() for more detail)
*/
re1->freestyle_bmain->wm.first = re1->freestyle_bmain->wm.last = NULL;
BKE_main_free(re1->freestyle_bmain);
#endif
re1->freestyle_bmain = NULL;
}
}