diff options
Diffstat (limited to 'intern/bsp')
| -rwxr-xr-x | intern/bsp/intern/BSP_CSGMeshBuilder.cpp | 12 | ||||
| -rwxr-xr-x | intern/bsp/intern/BSP_MeshFragment.cpp | 2 |
2 files changed, 6 insertions, 8 deletions
diff --git a/intern/bsp/intern/BSP_CSGMeshBuilder.cpp b/intern/bsp/intern/BSP_CSGMeshBuilder.cpp index c7242e09ca5..7e5b7e67fe8 100755 --- a/intern/bsp/intern/BSP_CSGMeshBuilder.cpp +++ b/intern/bsp/intern/BSP_CSGMeshBuilder.cpp @@ -89,13 +89,13 @@ NewMesh( } if (props.user_face_vertex_data_size) { - char * fv_data = NULL; - fv_data = new char[4 * props.user_face_vertex_data_size]; + char * fv_data2 = NULL; + fv_data2 = new char[4 * props.user_face_vertex_data_size]; - face.user_face_vertex_data[0] = fv_data; - face.user_face_vertex_data[1] = fv_data + props.user_face_vertex_data_size; - face.user_face_vertex_data[2] = fv_data + 2*props.user_face_vertex_data_size; - face.user_face_vertex_data[3] = fv_data + 3*props.user_face_vertex_data_size; + face.user_face_vertex_data[0] = fv_data2; + face.user_face_vertex_data[1] = fv_data2 + props.user_face_vertex_data_size; + face.user_face_vertex_data[2] = fv_data2 + 2*props.user_face_vertex_data_size; + face.user_face_vertex_data[3] = fv_data2 + 3*props.user_face_vertex_data_size; } else { face.user_face_vertex_data[0] = NULL; face.user_face_vertex_data[1] = NULL; diff --git a/intern/bsp/intern/BSP_MeshFragment.cpp b/intern/bsp/intern/BSP_MeshFragment.cpp index b7583f04d8b..cd79078f056 100755 --- a/intern/bsp/intern/BSP_MeshFragment.cpp +++ b/intern/bsp/intern/BSP_MeshFragment.cpp @@ -106,8 +106,6 @@ ClassifyPolygon( if (BSP_Classification(vert.OpenTag()) == e_unclassified) { MT_Scalar sdistance = plane.signedDistance(vert.m_pos); - MT_Scalar fsdistance = fabs(sdistance); - if (fabs(sdistance) <= BSP_SPLIT_EPSILON) { // this vertex is on vert.SetOpenTag(e_classified_on); |