diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2008-07-14 01:07:44 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2008-07-14 01:07:44 +0400 |
| commit | 00c4265bda4eda13ae52c6b2082edf69239aab9f (patch) | |
| tree | e3ad09cb5ac25e665ff1bd8e3b6c811f0fcef72f /intern/bsp | |
| parent | 151c8cc8648fb93c682d1a887a7d48533c50ca35 (diff) | |
svn merge -r15549:HEAD https://svn.blender.org/svnroot/bf-blender/trunk/blender
- mainly to fix the free() crash with the file selector
Diffstat (limited to 'intern/bsp')
| -rw-r--r-- | intern/bsp/intern/BSP_CSGMesh.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/intern/bsp/intern/BSP_CSGMesh.cpp b/intern/bsp/intern/BSP_CSGMesh.cpp index 553f39a4642..ca7795b3cf5 100644 --- a/intern/bsp/intern/BSP_CSGMesh.cpp +++ b/intern/bsp/intern/BSP_CSGMesh.cpp @@ -197,7 +197,7 @@ BuildEdges( for (int vert = 0; vert < vertex_num; ++vert) { - BSP_FaceInd fi(f_it - f_it_begin); + BSP_FaceInd fi(size_t (f_it - f_it_begin)); InsertEdge(prev_vi,face.m_verts[vert],fi,dummy); prev_vi = face.m_verts[vert]; } |