[Bf-committers] CVS commit: blender/intern/bsp/intern BSP_CSGMeshBuilder.cpp BSP_MeshFragment.cpp

[Unprivileged User]

sirdude     2003/01/03 16:53:46 CET

  Modified files:
    blender/intern/bsp/intern BSP_CSGMeshBuilder.cpp 
                              BSP_MeshFragment.cpp 
  
  Log:
  Two small updates to fix warnings.
  
  The first is renaming fv_data to fv_data2 to get rid of a shadow warning
  second is an unused var that was an extra uneeded call to fabs.
  
  Diff included:
  
  Kent
  --
  mein@cs.umn.edu
  
  Index: BSP_CSGMeshBuilder.cpp
  ===================================================================
  RCS file: /cvsroot/bf-blender/blender/intern/bsp/intern/BSP_CSGMeshBuilder.cpp,v
  retrieving revision 1.3
  diff -u -r1.3 BSP_CSGMeshBuilder.cpp
  --- BSP_CSGMeshBuilder.cpp      25 Nov 2002 09:52:48 -0000      1.3
  +++ BSP_CSGMeshBuilder.cpp      3 Jan 2003 15:47:15 -0000
  @@ -89,13 +89,13 @@
          }
  
          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_vert
  ex_data_size;
  -               face.user_face_vertex_data[3] = fv_data + 3*props.user_face_vert
  ex_data_size;
  +               face.user_face_vertex_data[0] = fv_data2;
  +               face.user_face_vertex_data[1] = fv_data2 + props.user_face_verte
  x_data_size;
  +               face.user_face_vertex_data[2] = fv_data2 + 2*props.user_face_ver
  tex_data_size;
  +               face.user_face_vertex_data[3] = fv_data2 + 3*props.user_face_ver
  tex_data_size;
          } else {
                  face.user_face_vertex_data[0] = NULL;
                  face.user_face_vertex_data[1] = NULL;
  [9:47] ~/blender/intern/bsp/intern(mein@captcrab) % cvs diff BSP_MeshFragment.cp
  p
  Index: BSP_MeshFragment.cpp
  ===================================================================
  RCS file: /cvsroot/bf-blender/blender/intern/bsp/intern/BSP_MeshFragment.cpp,v
  retrieving revision 1.3
  diff -u -r1.3 BSP_MeshFragment.cpp
  --- BSP_MeshFragment.cpp        25 Nov 2002 09:52:48 -0000      1.3
  +++ BSP_MeshFragment.cpp        3 Jan 2003 15:47:21 -0000
  @@ -106,8 +106,6 @@
                  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);
  
  Revision  Changes    Path
  1.4       +7 -7      blender/intern/bsp/intern/BSP_CSGMeshBuilder.cpp
  1.4       +1 -3      blender/intern/bsp/intern/BSP_MeshFragment.cpp