[Bf-blender-cvs] [431cee2] master: Freestyle: minor code cleanup.
Tamito Kajiyama
noreply at git.blender.org
Mon Jul 20 01:11:47 CEST 2015
Commit: 431cee2ba0ee8d45e0c0104c72bb1ad3d1f0d238
Author: Tamito Kajiyama
Date: Sun Jul 27 22:17:19 2014 +0900
Branches: master
https://developer.blender.org/rB431cee2ba0ee8d45e0c0104c72bb1ad3d1f0d238
Freestyle: minor code cleanup.
===================================================================
M source/blender/freestyle/intern/blender_interface/BlenderFileLoader.cpp
M source/blender/freestyle/intern/scene_graph/IndexedFaceSet.cpp
===================================================================
diff --git a/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.cpp b/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.cpp
index 7a61b73..7949a02 100644
--- a/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.cpp
+++ b/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.cpp
@@ -776,12 +776,12 @@ void BlenderFileLoader::insertShapeNode(ObjectInstanceRen *obi, int id)
for (v = detriList.begin(); v != detriList.end(); v++) {
detri_t detri = (*v);
if (detri.n == 0) {
- cleanVertices[detri.viP] = cleanVertices[detri.viA];
+ cleanVertices[detri.viP] = cleanVertices[detri.viA];
cleanVertices[detri.viP + 1] = cleanVertices[detri.viA + 1];
cleanVertices[detri.viP + 2] = cleanVertices[detri.viA + 2];
}
else if (detri.v.norm() > 0.0) {
- cleanVertices[detri.viP] += 1.0e-5 * detri.v.x();
+ cleanVertices[detri.viP] += 1.0e-5 * detri.v.x();
cleanVertices[detri.viP + 1] += 1.0e-5 * detri.v.y();
cleanVertices[detri.viP + 2] += 1.0e-5 * detri.v.z();
}
diff --git a/source/blender/freestyle/intern/scene_graph/IndexedFaceSet.cpp b/source/blender/freestyle/intern/scene_graph/IndexedFaceSet.cpp
index 8a2740b..90bf388 100644
--- a/source/blender/freestyle/intern/scene_graph/IndexedFaceSet.cpp
+++ b/source/blender/freestyle/intern/scene_graph/IndexedFaceSet.cpp
@@ -34,7 +34,7 @@ IndexedFaceSet::IndexedFaceSet() : Rep()
_Vertices = NULL;
_Normals = NULL;
_FrsMaterials = 0;
- _TexCoords = 0;
+ _TexCoords = NULL;
_FaceEdgeMarks = 0;
_VSize = 0;
_NSize = 0;
More information about the Bf-blender-cvs
mailing list