[Bf-blender-cvs] [7b1234b] master: Removed/disabled debugging code.

[Tamito Kajiyama]

Commit: 7b1234be1cd7c531e002d18b4cfbfa52ae7c65f7
Author: Tamito Kajiyama
Date:   Sat Jul 19 18:53:02 2014 +0900
Branches: master
https://developer.blender.org/rB7b1234be1cd7c531e002d18b4cfbfa52ae7c65f7

Removed/disabled debugging code.

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

M	intern/cycles/blender/blender_mesh.cpp
M	source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp
M	source/blender/freestyle/intern/stroke/StrokeRep.cpp
M	source/blender/render/intern/source/pipeline.c

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

diff --git a/intern/cycles/blender/blender_mesh.cpp b/intern/cycles/blender/blender_mesh.cpp
index 364ee9a..f07f0fd 100644
--- a/intern/cycles/blender/blender_mesh.cpp
+++ b/intern/cycles/blender/blender_mesh.cpp
@@ -408,30 +408,17 @@ static void create_mesh(Scene *scene, Mesh *mesh, BL::Mesh b_mesh, const vector<
 				float3 *fdata = attr->data_float3();
 				size_t i = 0;
 
-				std::cout << "name " << name << std::endl;
 				for(l->data.begin(t); t != l->data.end(); ++t, ++i) {
 					fdata[0] =  get_float3(t->uv1());
 					fdata[1] =  get_float3(t->uv2());
 					fdata[2] =  get_float3(t->uv3());
 					fdata += 3;
-#if 0
-					std::cout << "  1st "
-					          << "( " << t->uv1()[0] << ", " << t->uv1()[1] << ") "
-					          << "( " << t->uv2()[0] << ", " << t->uv2()[1] << ") "
-					          << "( " << t->uv3()[0] << ", " << t->uv3()[1] << ") " << std::endl;
-#endif
 
 					if(nverts[i] == 4) {
 						fdata[0] =  get_float3(t->uv1());
 						fdata[1] =  get_float3(t->uv3());
 						fdata[2] =  get_float3(t->uv4());
 						fdata += 3;
-#if 0
-						std::cout << "  2nd "
-						          << "( " << t->uv1()[0] << ", " << t->uv1()[1] << ") "
-						          << "( " << t->uv3()[0] << ", " << t->uv3()[1] << ") "
-						          << "( " << t->uv4()[0] << ", " << t->uv4()[1] << ") " << std::endl;
-#endif
 					}
 				}
 			}
diff --git a/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp b/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp
index ec78a0f..e755441 100644
--- a/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp
+++ b/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp
@@ -227,7 +227,6 @@ Material* BlenderStrokeRenderer::GetStrokeShader(bContext *C, Main *bmain, bNode
 	bNodeSocket *fromsock, *tosock;
 	PointerRNA fromptr, toptr;
 
-	cout << "linestyle " << linestyle << " nodetree " << linestyle->nodetree << " use_nodes " << linestyle->use_nodes << endl;
 	if (iNodeTree) {
 		// make a copy of linestyle->nodetree
 		ntree = ntreeCopyTree_ex(iNodeTree, bmain, true);
diff --git a/source/blender/freestyle/intern/stroke/StrokeRep.cpp b/source/blender/freestyle/intern/stroke/StrokeRep.cpp
index f4ac6f7..f785710 100644
--- a/source/blender/freestyle/intern/stroke/StrokeRep.cpp
+++ b/source/blender/freestyle/intern/stroke/StrokeRep.cpp
@@ -516,7 +516,6 @@ void Strip::setVertexColor (const vector<StrokeVertex *>& iStrokeVertices)
 
 void Strip::computeTexCoord (const vector<StrokeVertex *>& iStrokeVertices, float texStep)
 {
-	cout << "Strip::computeTexCoord texStep " << texStep << endl;
 	vector<StrokeVertex *>::const_iterator v, vend;
 	StrokeVertex *sv;
 	int i = 0;
diff --git a/source/blender/render/intern/source/pipeline.c b/source/blender/render/intern/source/pipeline.c
index 89b64e2..33b9cf7 100644
--- a/source/blender/render/intern/source/pipeline.c
+++ b/source/blender/render/intern/source/pipeline.c
@@ -1940,7 +1940,7 @@ static void add_freestyle(Render *re, int render)
 
 	actsrl = BLI_findlink(&re->r.layers, re->r.actlay);
 
-#if 0
+#if 1
 	re->freestyle_bmain = BKE_main_new();
 
 	/* We use the same window manager for freestyle bmain as
@@ -2020,7 +2020,7 @@ static void free_all_freestyle_renders(void)
 			if (freestyle_render) {
 				freestyle_scene = freestyle_render->scene;
 				RE_FreeRender(freestyle_render);
-#if 0
+#if 1
 				BKE_scene_unlink(re1->freestyle_bmain, freestyle_scene, NULL);
 #endif
 			}
@@ -2028,7 +2028,7 @@ static void free_all_freestyle_renders(void)
 		BLI_freelistN(&re1->freestyle_renders);
 
 		if (re1->freestyle_bmain) {
-#if 0
+#if 1
 			/* detach the window manager from freestyle bmain (see comments
 			 * in add_freestyle() for more detail)
 			 */