[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [56187] trunk/blender/source/blender: Minor code clean-up & removal of unused code segments.

[Tamito Kajiyama]

Revision: 56187
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=56187
Author:   kjym3
Date:     2013-04-20 23:00:27 +0000 (Sat, 20 Apr 2013)
Log Message:
-----------
Minor code clean-up & removal of unused code segments.

Modified Paths:
--------------
    trunk/blender/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp
    trunk/blender/source/blender/render/intern/source/pipeline.c

Modified: trunk/blender/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp
===================================================================
--- trunk/blender/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp	2013-04-20 21:15:17 UTC (rev 56186)
+++ trunk/blender/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp	2013-04-20 23:00:27 UTC (rev 56187)
@@ -30,11 +30,7 @@
 
 #include "BKE_global.h"
 
-// XXX Are those "ifdef __cplusplus" useful here?
-#ifdef __cplusplus
 extern "C" {
-#endif
-
 #include "MEM_guardedalloc.h"
 
 #include "DNA_camera_types.h"
@@ -55,10 +51,7 @@
 #include "BKE_scene.h"
 
 #include "RE_pipeline.h"
-
-#ifdef __cplusplus
 }
-#endif
 
 namespace Freestyle {
 
@@ -74,7 +67,6 @@
 	_width = re->winx;
 	_height = re->winy;
 
-	//Scene.New("FreestyleStrokes")
 	old_scene = re->scene;
 
 	char name[22];
@@ -136,9 +128,6 @@
 	_z_delta = 0.00001f;
 	_z = camera->clipsta + _z_delta;
 
-	// test
-	//_z = 999.90f; _z_delta = 0.01f;
-
 	object_camera->loc[0] = re->disprect.xmin + 0.5f * re->rectx;
 	object_camera->loc[1] = re->disprect.ymin + 0.5f * re->recty;
 	object_camera->loc[2] = 1.0f;
@@ -197,8 +186,6 @@
 	// release material
 	BKE_libblock_free(&_freestyle_bmain.mat, material);
 
-	//BKE_scene_set_background(&_freestyle_bmain, old_scene);
-
 	BKE_scene_unlink(&_freestyle_bmain, freestyle_scene, NULL);
 }
 
@@ -288,21 +275,10 @@
 		Object *object_mesh = NewMesh();
 #endif
 		Mesh *mesh = (Mesh *)object_mesh->data;
-#if 0
-		MEM_freeN(mesh->bb);
-		mesh->bb = NULL;
-		mesh->id.us = 0;
-#endif
-#if 1
-		//me.materials = [mat]
 		mesh->mat = (Material **)MEM_mallocN(1 * sizeof(Material *), "MaterialList");
 		mesh->mat[0] = material;
 		mesh->totcol = 1;
 		test_object_materials((Main *) &_freestyle_bmain, (ID *)mesh);
-#else
-		assign_material(object_mesh, material, object_mesh->totcol + 1);
-		object_mesh->actcol = object_mesh->totcol;
-#endif
 
 		// vertices allocation
 		mesh->totvert = visible_faces + visible_segments * 2;

Modified: trunk/blender/source/blender/render/intern/source/pipeline.c
===================================================================
--- trunk/blender/source/blender/render/intern/source/pipeline.c	2013-04-20 21:15:17 UTC (rev 56186)
+++ trunk/blender/source/blender/render/intern/source/pipeline.c	2013-04-20 23:00:27 UTC (rev 56187)
@@ -1070,7 +1070,7 @@
 	re->stats_draw(re->sdh, &re->i);
 
 #ifdef WITH_FREESTYLE
-	/* Freestyle  */
+	/* Freestyle */
 	if (re->r.mode & R_EDGE_FRS) {
 		if (!re->test_break(re->tbh)) {
 			add_freestyle(re);
@@ -1123,7 +1123,7 @@
 	threaded_tile_processor(re);
 	
 #ifdef WITH_FREESTYLE
-	/* Freestyle  */
+	/* Freestyle */
 	if (re->r.mode & R_EDGE_FRS)
 		if (!re->test_break(re->tbh))
 			add_freestyle(re);