diff options
author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2014-07-21 14:41:11 +0400 |
---|---|---|
committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2014-08-12 05:10:49 +0400 |
commit | b6065207913289cfab78ed3d5441f27342864f67 (patch) | |
tree | 2f2b0ae6be640a987fb8643ee8f34177bd787549 | |
parent | f7d3f2b228d3d24f9b48f9ba0c90b68059188035 (diff) |
Freestyle: Removed debugging code (use G.main instead of Freestyle-local struct Main).
-rw-r--r-- | source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp | 4 | ||||
-rw-r--r-- | source/blender/render/intern/source/pipeline.c | 8 |
2 files changed, 0 insertions, 12 deletions
diff --git a/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp b/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp index 129243a19f7..ed5539a6d4f 100644 --- a/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp +++ b/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp @@ -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 diff --git a/source/blender/render/intern/source/pipeline.c b/source/blender/render/intern/source/pipeline.c index 33b9cf764a9..aaaa53bd54c 100644 --- a/source/blender/render/intern/source/pipeline.c +++ b/source/blender/render/intern/source/pipeline.c @@ -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; } } |