From 1d03a8b30932e6a4c4e511eef3f543590b0bcd2a Mon Sep 17 00:00:00 2001 From: Tamito Kajiyama Date: Wed, 7 May 2014 23:15:05 +0900 Subject: [PATCH] Freestyle: minor code clean-up. --- .../intern/blender_interface/BlenderStrokeRenderer.cpp | 2 -- source/blender/freestyle/intern/stroke/Stroke.h | 4 ++-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp b/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp index e0520fdff14..866d0596288 100644 --- a/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp +++ b/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp @@ -270,7 +270,6 @@ void BlenderStrokeRenderer::RenderStrokeRepBasic(StrokeRep *iStrokeRep) const const bool hasTex = iStrokeRep->getMTex(0) != NULL; Strip::vertex_container::iterator v[3]; StrokeVertexRep *svRep[3]; - /* Vec3r color[3]; */ /* UNUSED */ unsigned int vertex_index, edge_index, loop_index; Vec2r p; @@ -317,7 +316,6 @@ void BlenderStrokeRenderer::RenderStrokeRepBasic(StrokeRep *iStrokeRep) const if (visible_faces == 0) continue; - //me = Mesh.New() #if 0 Object *object_mesh = BKE_object_add(freestyle_bmain, freestyle_scene, OB_MESH); #else diff --git a/source/blender/freestyle/intern/stroke/Stroke.h b/source/blender/freestyle/intern/stroke/Stroke.h index d6c8c4f0d07..f6451d8e487 100644 --- a/source/blender/freestyle/intern/stroke/Stroke.h +++ b/source/blender/freestyle/intern/stroke/Stroke.h @@ -650,7 +650,8 @@ public: /*! Returns the texture used at given index to simulate the marks system for this Stroke */ inline MTex *getMTex(int idx) { - return _mtex[idx];} + return _mtex[idx]; + } /*! Returns true if this Stroke has textures assigned, false otherwise. */ inline bool hasTex() const @@ -760,7 +761,6 @@ public: for (int a = 0; a < MAX_MTEX; a++) { if (!_mtex[a]) { _mtex[a] = mtex; - return 0; } }