[Bf-blender-cvs] [b606520] master: Freestyle: Removed debugging code (use G.main instead of Freestyle-local struct Main).

Tamito Kajiyama noreply at git.blender.org
Tue Aug 12 03:18:28 CEST 2014


Commit: b6065207913289cfab78ed3d5441f27342864f67
Author: Tamito Kajiyama
Date:   Mon Jul 21 19:41:11 2014 +0900
Branches: master
https://developer.blender.org/rBb6065207913289cfab78ed3d5441f27342864f67

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

===================================================================

M	source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp
M	source/blender/render/intern/source/pipeline.c

===================================================================

diff --git a/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp b/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp
index 129243a..ed5539a 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 33b9cf7..aaaa53b 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;
 		}
 	}




More information about the Bf-blender-cvs mailing list