[Bf-blender-cvs] [1d03a8b] master: Freestyle: minor code clean-up.
Tamito Kajiyama
noreply at git.blender.org
Wed May 7 16:16:57 CEST 2014
Commit: 1d03a8b30932e6a4c4e511eef3f543590b0bcd2a
Author: Tamito Kajiyama
Date: Wed May 7 23:15:05 2014 +0900
https://developer.blender.org/rB1d03a8b30932e6a4c4e511eef3f543590b0bcd2a
Freestyle: minor code clean-up.
===================================================================
M source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp
M source/blender/freestyle/intern/stroke/Stroke.h
===================================================================
diff --git a/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp b/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp
index e0520fd..866d059 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 d6c8c4f..f6451d8 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;
}
}
More information about the Bf-blender-cvs
mailing list