diff options
author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2014-07-19 10:37:13 +0400 |
---|---|---|
committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2014-08-12 05:10:34 +0400 |
commit | a2a2d4679ae28dbc9f6bed1c8663cea9ccb71176 (patch) | |
tree | 974443d11a1d975913a0d24b2013edebdf0a938b | |
parent | 622ef089f93629a7f9e67db6e47ab5cf05291b66 (diff) |
Made temporary changes to use G.main rather than Freestyle-local Main for debugging.
-rw-r--r-- | source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp | 2 | ||||
-rw-r--r-- | source/blender/render/intern/source/pipeline.c | 8 |
2 files changed, 10 insertions, 0 deletions
diff --git a/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp b/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp index 0537caf9869..b119b10b9cb 100644 --- a/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp +++ b/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp @@ -145,6 +145,8 @@ BlenderStrokeRenderer::BlenderStrokeRenderer(bContext *C, Render *re, int render BlenderStrokeRenderer::~BlenderStrokeRenderer() { + return; //XXX + // 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 aaaa53bd54c..89b64e287bb 100644 --- a/source/blender/render/intern/source/pipeline.c +++ b/source/blender/render/intern/source/pipeline.c @@ -1940,6 +1940,7 @@ static void add_freestyle(Render *re, int render) actsrl = BLI_findlink(&re->r.layers, re->r.actlay); +#if 0 re->freestyle_bmain = BKE_main_new(); /* We use the same window manager for freestyle bmain as @@ -1950,6 +1951,9 @@ 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); @@ -2016,18 +2020,22 @@ static void free_all_freestyle_renders(void) if (freestyle_render) { freestyle_scene = freestyle_render->scene; RE_FreeRender(freestyle_render); +#if 0 BKE_scene_unlink(re1->freestyle_bmain, freestyle_scene, NULL); +#endif } } BLI_freelistN(&re1->freestyle_renders); if (re1->freestyle_bmain) { +#if 0 /* 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; } } |