[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [11168] branches/imgbrowser-elubie: == imagebrowser ==
Andrea Weikert
elubie at gmx.net
Wed Jul 4 22:08:08 CEST 2007
Revision: 11168
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=11168
Author: elubie
Date: 2007-07-04 22:08:07 +0200 (Wed, 04 Jul 2007)
Log Message:
-----------
== imagebrowser ==
- merge from trunk, rev. 11045 to 11165
NOTE: blenderbuttons.c conflicted and was NOT merged. The Action/IPO Mute Icons still have to be added manually. Also not merged as a consequence was /release/datafiles/blenderbuttons. The #defines for the icons was left in, those will just show as empty icons for now.
Modified Paths:
--------------
branches/imgbrowser-elubie/bin/.blender/locale/it/LC_MESSAGES/blender.mo
branches/imgbrowser-elubie/config/darwin-config.py
branches/imgbrowser-elubie/config/linux2-config.py
branches/imgbrowser-elubie/config/linuxcross-config.py
branches/imgbrowser-elubie/config/openbsd3-config.py
branches/imgbrowser-elubie/config/sunos5-config.py
branches/imgbrowser-elubie/config/win32-mingw-config.py
branches/imgbrowser-elubie/config/win32-vc-config.py
branches/imgbrowser-elubie/extern/verse/dist/v_connection.c
branches/imgbrowser-elubie/extern/verse/dist/v_network.c
branches/imgbrowser-elubie/intern/boolop/intern/BOP_BSPNode.cpp
branches/imgbrowser-elubie/intern/boolop/intern/BOP_Face2Face.cpp
branches/imgbrowser-elubie/intern/boolop/intern/BOP_MathUtils.cpp
branches/imgbrowser-elubie/intern/boolop/intern/BOP_Merge.cpp
branches/imgbrowser-elubie/intern/ghost/intern/GHOST_WindowX11.cpp
branches/imgbrowser-elubie/intern/make/msvc_7_0/intern.sln
branches/imgbrowser-elubie/po/it.po
branches/imgbrowser-elubie/release/scripts/object_random_loc_sz_rot.py
branches/imgbrowser-elubie/source/Makefile
branches/imgbrowser-elubie/source/blender/SConscript
branches/imgbrowser-elubie/source/blender/blenkernel/BKE_verse.h
branches/imgbrowser-elubie/source/blender/blenkernel/SConscript
branches/imgbrowser-elubie/source/blender/blenkernel/intern/Makefile
branches/imgbrowser-elubie/source/blender/blenkernel/intern/constraint.c
branches/imgbrowser-elubie/source/blender/blenkernel/intern/image.c
branches/imgbrowser-elubie/source/blender/blenkernel/intern/object.c
branches/imgbrowser-elubie/source/blender/blenkernel/intern/verse_geometry_node.c
branches/imgbrowser-elubie/source/blender/blenlib/BLI_arithb.h
branches/imgbrowser-elubie/source/blender/blenlib/intern/arithb.c
branches/imgbrowser-elubie/source/blender/blenloader/intern/readfile.c
branches/imgbrowser-elubie/source/blender/blenloader/intern/writefile.c
branches/imgbrowser-elubie/source/blender/imbuf/IMB_imbuf_types.h
branches/imgbrowser-elubie/source/blender/imbuf/SConscript
branches/imgbrowser-elubie/source/blender/imbuf/intern/Makefile
branches/imgbrowser-elubie/source/blender/imbuf/intern/readimage.c
branches/imgbrowser-elubie/source/blender/imbuf/intern/util.c
branches/imgbrowser-elubie/source/blender/imbuf/intern/writeimage.c
branches/imgbrowser-elubie/source/blender/include/BIF_editaction.h
branches/imgbrowser-elubie/source/blender/include/BIF_editseq.h
branches/imgbrowser-elubie/source/blender/include/BIF_resources.h
branches/imgbrowser-elubie/source/blender/include/BSE_editaction_types.h
branches/imgbrowser-elubie/source/blender/include/blendef.h
branches/imgbrowser-elubie/source/blender/makesdna/DNA_scene_types.h
branches/imgbrowser-elubie/source/blender/python/api2_2x/BezTriple.c
branches/imgbrowser-elubie/source/blender/python/api2_2x/Camera.c
branches/imgbrowser-elubie/source/blender/python/api2_2x/Constraint.c
branches/imgbrowser-elubie/source/blender/python/api2_2x/CurNurb.c
branches/imgbrowser-elubie/source/blender/python/api2_2x/Curve.c
branches/imgbrowser-elubie/source/blender/python/api2_2x/Effect.c
branches/imgbrowser-elubie/source/blender/python/api2_2x/Font.c
branches/imgbrowser-elubie/source/blender/python/api2_2x/Group.c
branches/imgbrowser-elubie/source/blender/python/api2_2x/Image.c
branches/imgbrowser-elubie/source/blender/python/api2_2x/Ipo.c
branches/imgbrowser-elubie/source/blender/python/api2_2x/Ipocurve.c
branches/imgbrowser-elubie/source/blender/python/api2_2x/Lamp.c
branches/imgbrowser-elubie/source/blender/python/api2_2x/Lattice.c
branches/imgbrowser-elubie/source/blender/python/api2_2x/Material.c
branches/imgbrowser-elubie/source/blender/python/api2_2x/Mesh.c
branches/imgbrowser-elubie/source/blender/python/api2_2x/Metaball.c
branches/imgbrowser-elubie/source/blender/python/api2_2x/Modifier.c
branches/imgbrowser-elubie/source/blender/python/api2_2x/NMesh.c
branches/imgbrowser-elubie/source/blender/python/api2_2x/Object.c
branches/imgbrowser-elubie/source/blender/python/api2_2x/Scene.c
branches/imgbrowser-elubie/source/blender/python/api2_2x/Sound.c
branches/imgbrowser-elubie/source/blender/python/api2_2x/Text.c
branches/imgbrowser-elubie/source/blender/python/api2_2x/Text3d.c
branches/imgbrowser-elubie/source/blender/python/api2_2x/Texture.c
branches/imgbrowser-elubie/source/blender/python/api2_2x/World.c
branches/imgbrowser-elubie/source/blender/python/api2_2x/bpy_config.c
branches/imgbrowser-elubie/source/blender/python/api2_2x/gen_utils.c
branches/imgbrowser-elubie/source/blender/python/api2_2x/logic.c
branches/imgbrowser-elubie/source/blender/python/api2_2x/rgbTuple.c
branches/imgbrowser-elubie/source/blender/python/api2_2x/sceneRender.c
branches/imgbrowser-elubie/source/blender/python/api2_2x/sceneSequence.c
branches/imgbrowser-elubie/source/blender/python/api2_2x/windowTheme.c
branches/imgbrowser-elubie/source/blender/src/Makefile
branches/imgbrowser-elubie/source/blender/src/SConscript
branches/imgbrowser-elubie/source/blender/src/buttons_scene.c
branches/imgbrowser-elubie/source/blender/src/drawaction.c
branches/imgbrowser-elubie/source/blender/src/drawimage.c
branches/imgbrowser-elubie/source/blender/src/drawipo.c
branches/imgbrowser-elubie/source/blender/src/drawnla.c
branches/imgbrowser-elubie/source/blender/src/editaction.c
branches/imgbrowser-elubie/source/blender/src/editarmature.c
branches/imgbrowser-elubie/source/blender/src/editdeform.c
branches/imgbrowser-elubie/source/blender/src/editipo.c
branches/imgbrowser-elubie/source/blender/src/editipo_mods.c
branches/imgbrowser-elubie/source/blender/src/editmesh_tools.c
branches/imgbrowser-elubie/source/blender/src/editnode.c
branches/imgbrowser-elubie/source/blender/src/editseq.c
branches/imgbrowser-elubie/source/blender/src/filesel.c
branches/imgbrowser-elubie/source/blender/src/header_info.c
branches/imgbrowser-elubie/source/blender/src/header_ipo.c
branches/imgbrowser-elubie/source/blender/src/header_seq.c
branches/imgbrowser-elubie/source/blender/src/header_view3d.c
branches/imgbrowser-elubie/source/blender/src/space.c
branches/imgbrowser-elubie/source/blender/src/writeimage.c
branches/imgbrowser-elubie/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
branches/imgbrowser-elubie/source/gameengine/Ketsji/KX_GameObject.h
branches/imgbrowser-elubie/source/gameengine/Ketsji/KX_IpoActuator.cpp
branches/imgbrowser-elubie/source/gameengine/SceneGraph/SG_Node.h
branches/imgbrowser-elubie/source/nan_definitions.mk
branches/imgbrowser-elubie/tools/btools.py
Added Paths:
-----------
branches/imgbrowser-elubie/source/blender/imbuf/intern/dds/
branches/imgbrowser-elubie/source/blender/imbuf/intern/dds/BlockDXT.cpp
branches/imgbrowser-elubie/source/blender/imbuf/intern/dds/BlockDXT.h
branches/imgbrowser-elubie/source/blender/imbuf/intern/dds/Color.h
branches/imgbrowser-elubie/source/blender/imbuf/intern/dds/ColorBlock.cpp
branches/imgbrowser-elubie/source/blender/imbuf/intern/dds/ColorBlock.h
branches/imgbrowser-elubie/source/blender/imbuf/intern/dds/Common.h
branches/imgbrowser-elubie/source/blender/imbuf/intern/dds/DirectDrawSurface.cpp
branches/imgbrowser-elubie/source/blender/imbuf/intern/dds/DirectDrawSurface.h
branches/imgbrowser-elubie/source/blender/imbuf/intern/dds/Image.cpp
branches/imgbrowser-elubie/source/blender/imbuf/intern/dds/Image.h
branches/imgbrowser-elubie/source/blender/imbuf/intern/dds/Makefile
branches/imgbrowser-elubie/source/blender/imbuf/intern/dds/SConscript
branches/imgbrowser-elubie/source/blender/imbuf/intern/dds/Stream.cpp
branches/imgbrowser-elubie/source/blender/imbuf/intern/dds/Stream.h
branches/imgbrowser-elubie/source/blender/imbuf/intern/dds/dds_api.cpp
branches/imgbrowser-elubie/source/blender/imbuf/intern/dds/dds_api.h
Removed Paths:
-------------
branches/imgbrowser-elubie/intern/action/
branches/imgbrowser-elubie/intern/csg/
branches/imgbrowser-elubie/intern/keymaker/
branches/imgbrowser-elubie/source/blender/imbuf/intern/dds/BlockDXT.cpp
branches/imgbrowser-elubie/source/blender/imbuf/intern/dds/BlockDXT.h
branches/imgbrowser-elubie/source/blender/imbuf/intern/dds/Color.h
branches/imgbrowser-elubie/source/blender/imbuf/intern/dds/ColorBlock.cpp
branches/imgbrowser-elubie/source/blender/imbuf/intern/dds/ColorBlock.h
branches/imgbrowser-elubie/source/blender/imbuf/intern/dds/Common.h
branches/imgbrowser-elubie/source/blender/imbuf/intern/dds/DirectDrawSurface.cpp
branches/imgbrowser-elubie/source/blender/imbuf/intern/dds/DirectDrawSurface.h
branches/imgbrowser-elubie/source/blender/imbuf/intern/dds/Image.cpp
branches/imgbrowser-elubie/source/blender/imbuf/intern/dds/Image.h
branches/imgbrowser-elubie/source/blender/imbuf/intern/dds/Makefile
branches/imgbrowser-elubie/source/blender/imbuf/intern/dds/SConscript
branches/imgbrowser-elubie/source/blender/imbuf/intern/dds/Stream.cpp
branches/imgbrowser-elubie/source/blender/imbuf/intern/dds/Stream.h
branches/imgbrowser-elubie/source/blender/imbuf/intern/dds/dds_api.cpp
branches/imgbrowser-elubie/source/blender/imbuf/intern/dds/dds_api.h
Modified: branches/imgbrowser-elubie/bin/.blender/locale/it/LC_MESSAGES/blender.mo
===================================================================
(Binary files differ)
Modified: branches/imgbrowser-elubie/config/darwin-config.py
===================================================================
--- branches/imgbrowser-elubie/config/darwin-config.py 2007-07-04 19:29:59 UTC (rev 11167)
+++ branches/imgbrowser-elubie/config/darwin-config.py 2007-07-04 20:08:07 UTC (rev 11168)
@@ -52,6 +52,7 @@
BF_OPENEXR_INC = '${BF_OPENEXR}/include/OpenEXR'
BF_OPENEXR_LIB = ' Iex Half IlmImf Imath IlmThread'
+WITH_BF_DDS = 'true'
WITH_BF_JPEG = 'true'
BF_JPEG = LIBDIR + '/jpeg'
Modified: branches/imgbrowser-elubie/config/linux2-config.py
===================================================================
--- branches/imgbrowser-elubie/config/linux2-config.py 2007-07-04 19:29:59 UTC (rev 11167)
+++ branches/imgbrowser-elubie/config/linux2-config.py 2007-07-04 20:08:07 UTC (rev 11168)
@@ -32,6 +32,8 @@
BF_OPENEXR_INC = '${BF_OPENEXR}/include/OpenEXR'
BF_OPENEXR_LIB = 'Half IlmImf Iex Imath '
+WITH_BF_DDS = 'true'
+
WITH_BF_JPEG = 'true'
BF_JPEG = '/usr'
BF_JPEG_INC = '${BF_JPEG}/include'
Modified: branches/imgbrowser-elubie/config/linuxcross-config.py
===================================================================
--- branches/imgbrowser-elubie/config/linuxcross-config.py 2007-07-04 19:29:59 UTC (rev 11167)
+++ branches/imgbrowser-elubie/config/linuxcross-config.py 2007-07-04 20:08:07 UTC (rev 11168)
@@ -39,6 +39,8 @@
BF_OPENEXR_LIB = ' Half IlmImf Iex '
BF_OPENEXR_LIBPATH = '${BF_OPENEXR}/lib'
+WITH_BF_DDS = 'true'
+
WITH_BF_JPEG = 'true'
BF_JPEG = LIBDIR + '/jpeg'
BF_JPEG_INC = '${BF_JPEG}/include'
Modified: branches/imgbrowser-elubie/config/openbsd3-config.py
===================================================================
--- branches/imgbrowser-elubie/config/openbsd3-config.py 2007-07-04 19:29:59 UTC (rev 11167)
+++ branches/imgbrowser-elubie/config/openbsd3-config.py 2007-07-04 20:08:07 UTC (rev 11168)
@@ -28,6 +28,8 @@
BF_OPENEXR_INC = '${BF_OPENEXR}/include/OpenEXR'
BF_OPENEXR_LIB = 'Half IlmImf Iex Imath '
+WITH_BF_DDS = 'true'
+
WITH_BF_JPEG = 'true'
BF_JPEG = '/usr/local'
BF_JPEG_INC = '${BF_JPEG}/include'
Modified: branches/imgbrowser-elubie/config/sunos5-config.py
===================================================================
--- branches/imgbrowser-elubie/config/sunos5-config.py 2007-07-04 19:29:59 UTC (rev 11167)
+++ branches/imgbrowser-elubie/config/sunos5-config.py 2007-07-04 20:08:07 UTC (rev 11168)
@@ -29,6 +29,8 @@
BF_OPENEXR_LIBPATH = '${BF_OPENEXR}/lib'
BF_OPENEXR_LIB = 'Half IlmImf Iex Imath '
+WITH_BF_DDS = 'true'
+
WITH_BF_JPEG = 'true'
BF_JPEG = '/usr/local'
BF_JPEG_INC = '${BF_JPEG}/include'
Modified: branches/imgbrowser-elubie/config/win32-mingw-config.py
===================================================================
--- branches/imgbrowser-elubie/config/win32-mingw-config.py 2007-07-04 19:29:59 UTC (rev 11167)
+++ branches/imgbrowser-elubie/config/win32-mingw-config.py 2007-07-04 20:08:07 UTC (rev 11168)
@@ -42,6 +42,8 @@
BF_OPENEXR_LIB = ' Half IlmImf Iex '
BF_OPENEXR_LIBPATH = '${BF_OPENEXR}/lib'
+WITH_BF_DDS = 'true'
+
WITH_BF_JPEG = 'true'
BF_JPEG = LIBDIR + '/jpeg'
BF_JPEG_INC = '${BF_JPEG}/include'
@@ -60,7 +62,6 @@
WITH_BF_ZLIB = 'true'
BF_ZLIB = LIBDIR + '/zlib'
BF_ZLIB_INC = '${BF_ZLIB}/include'
-#BF_ZLIB_LIB = 'z'
BF_ZLIB_LIBPATH = '${BF_ZLIB}/lib'
WITH_BF_INTERNATIONAL = 'true'
@@ -109,9 +110,6 @@
#BF_MOZILLA_LIB =
# Will fall back to look in BF_MOZILLA_INC/nspr and BF_MOZILLA_LIB
# if this is not set.
-#
-# Be paranoid regarding library creation (do not update archives)
-#BF_PARANOID = 'true'
# enable freetype2 support for text objects
BF_FREETYPE = LIBDIR + '/gcc/freetype'
@@ -141,8 +139,6 @@
##
CC = 'gcc'
CXX = 'g++'
-##ifeq ($CPU),alpha)
-## CFLAGS += -pipe -fPIC -funsigned-char -fno-strict-aliasing -mieee
CCFLAGS = [ '-pipe', '-funsigned-char', '-fno-strict-aliasing' ]
@@ -150,22 +146,13 @@
CXXFLAGS = ['-pipe', '-mwindows', '-funsigned-char', '-fno-strict-aliasing' ]
REL_CFLAGS = [ '-O2' ]
REL_CCFLAGS = [ '-O2' ]
-##BF_DEPEND = 'true'
-##
-##AR = ar
-##ARFLAGS = ruv
-##ARFLAGSQUIET = ru
-##
+
C_WARN = [ '-Wall' , '-Wno-char-subscripts', '-Wdeclaration-after-statement' ]
CC_WARN = [ '-Wall' ]
-##FIX_STUBS_WARNINGS = -Wno-unused
+LLIBS = ['-lshell32', '-lshfolder', '-ldxguid', '-lgdi32', '-lmsvcrt', '-lwinmm', '-lmingw32', '-lm', '-lws2_32', '-lz', '-lstdc++']
-LLIBS = ['-lshell32', '-lshfolder', '-ldxguid', '-lgdi32', '-lmsvcrt', '-lwinmm', '-lmingw32', '-lm', '-lws2_32', '-lz'] #'-lutil', '-lc', '-lm', '-ldl', '-lpthread']
-##LOPTS = --dynamic
-##DYNLDFLAGS = -shared $(LDFLAGS)
-
BF_DEBUG = 'false'
BF_DEBUG_FLAGS= '-g'
Modified: branches/imgbrowser-elubie/config/win32-vc-config.py
===================================================================
--- branches/imgbrowser-elubie/config/win32-vc-config.py 2007-07-04 19:29:59 UTC (rev 11167)
+++ branches/imgbrowser-elubie/config/win32-vc-config.py 2007-07-04 20:08:07 UTC (rev 11168)
@@ -50,6 +50,8 @@
BF_OPENEXR_LIB = ' Iex Half IlmImf Imath IlmThread '
BF_OPENEXR_LIBPATH = '${BF_OPENEXR}/lib_msvc'
+WITH_BF_DDS = 'true'
+
WITH_BF_JPEG = 'true'
BF_JPEG = LIBDIR + '/jpeg'
BF_JPEG_INC = '${BF_JPEG}/include'
Modified: branches/imgbrowser-elubie/extern/verse/dist/v_connection.c
===================================================================
--- branches/imgbrowser-elubie/extern/verse/dist/v_connection.c 2007-07-04 19:29:59 UTC (rev 11167)
+++ branches/imgbrowser-elubie/extern/verse/dist/v_connection.c 2007-07-04 20:08:07 UTC (rev 11168)
@@ -275,7 +275,8 @@
{
static unsigned int seconds;
boolean output = FALSE;
- unsigned int size, connection, s;
+ size_t size;
+ unsigned int connection, s;
VNetInPacked *p;
v_n_get_current_time(&s, NULL);
Modified: branches/imgbrowser-elubie/extern/verse/dist/v_network.c
===================================================================
--- branches/imgbrowser-elubie/extern/verse/dist/v_network.c 2007-07-04 19:29:59 UTC (rev 11167)
+++ branches/imgbrowser-elubie/extern/verse/dist/v_network.c 2007-07-04 20:08:07 UTC (rev 11168)
@@ -37,6 +37,10 @@
#include "v_cmd_gen.h"
#include "v_network.h"
+#if !defined socklen_t
+#define socklen_t int
+#endif
+
#define TRUE 1
#define FALSE 0
@@ -209,7 +213,8 @@
int v_n_receive_data(VNetworkAddress *address, char *data, size_t length)
{
struct sockaddr_in address_in;
- size_t from_length = sizeof address_in, len;
+ socklen_t from_length = sizeof address_in;
+ size_t len;
if(v_n_socket_create() == -1)
return 0;
Modified: branches/imgbrowser-elubie/intern/boolop/intern/BOP_BSPNode.cpp
===================================================================
--- branches/imgbrowser-elubie/intern/boolop/intern/BOP_BSPNode.cpp 2007-07-04 19:29:59 UTC (rev 11167)
+++ branches/imgbrowser-elubie/intern/boolop/intern/BOP_BSPNode.cpp 2007-07-04 20:08:07 UTC (rev 11168)
@@ -98,7 +98,7 @@
// classify each line segment, looking for endpoints which lie on different
// sides of the hyperplane.
- BOP_IT_BSPPoints ptsEnd = pts.end();
+ ptsEnd = pts.end();
for(BOP_IT_BSPPoints itp=pts.begin();itp!=ptsEnd;itp++){
MT_Point3 npoint= *itp;
BOP_TAG ntag = testPoint(npoint);
Modified: branches/imgbrowser-elubie/intern/boolop/intern/BOP_Face2Face.cpp
===================================================================
--- branches/imgbrowser-elubie/intern/boolop/intern/BOP_Face2Face.cpp 2007-07-04 19:29:59 UTC (rev 11167)
+++ branches/imgbrowser-elubie/intern/boolop/intern/BOP_Face2Face.cpp 2007-07-04 20:08:07 UTC (rev 11168)
@@ -1,4 +1,7 @@
/**
+ *
+ * $Id$
+ *
* ***** BEGIN GPL/BL DUAL LICENSE BLOCK *****
*
* This program is free software; you can redistribute it and/or
@@ -23,7 +26,7 @@
*
* The Original Code is: all of this file.
*
- * Contributor(s): none yet.
+ * Contributor(s): Marc Freixas, Ken Hughes
*
* ***** END GPL/BL DUAL LICENSE BLOCK *****
*/
@@ -427,17 +430,11 @@
// v2 ~= v3
mesh->replaceVertexIndex(v2,v3);
} else {
-#if 0
- /*
- * for now, don't just remove "co-linear" faces; some of these faces
- * being removed are real and cause other things to break
- */
// all differents
if (BOP_collinear(vertex1,vertex2,vertex3)) {
// collinear triangle
face->setTAG(PHANTOM);
}
-#endif
}
}
}
Modified: branches/imgbrowser-elubie/intern/boolop/intern/BOP_MathUtils.cpp
===================================================================
--- branches/imgbrowser-elubie/intern/boolop/intern/BOP_MathUtils.cpp 2007-07-04 19:29:59 UTC (rev 11167)
+++ branches/imgbrowser-elubie/intern/boolop/intern/BOP_MathUtils.cpp 2007-07-04 20:08:07 UTC (rev 11168)
@@ -1,4 +1,7 @@
/**
+ *
+ * $Id$
+ *
* ***** BEGIN GPL/BL DUAL LICENSE BLOCK *****
*
* This program is free software; you can redistribute it and/or
@@ -23,7 +26,7 @@
*
* The Original Code is: all of this file.
*
- * Contributor(s): none yet.
+ * Contributor(s): Marc Freixas, Ken Hughes
*
* ***** END GPL/BL DUAL LICENSE BLOCK *****
*/
@@ -115,7 +118,12 @@
{
MT_Vector3 v1 = p2 - p1;
MT_Vector3 v2 = p3 - p2;
-
+
+ /* normalize vectors before taking their cross product, so its length
+ * has some actual meaning */
+ v1.normalize();
+ v2.normalize();
+
MT_Vector3 w = v1.cross(v2);
return (BOP_comp(w.x(),0.0) == 0) && (BOP_comp(w.y(),0.0) == 0) && (BOP_comp(w.z(),0.0) == 0);
Modified: branches/imgbrowser-elubie/intern/boolop/intern/BOP_Merge.cpp
===================================================================
--- branches/imgbrowser-elubie/intern/boolop/intern/BOP_Merge.cpp 2007-07-04 19:29:59 UTC (rev 11167)
+++ branches/imgbrowser-elubie/intern/boolop/intern/BOP_Merge.cpp 2007-07-04 20:08:07 UTC (rev 11168)
@@ -1,4 +1,7 @@
/**
+ *
+ * $Id$
+ *
* ***** BEGIN GPL/BL DUAL LICENSE BLOCK *****
*
* This program is free software; you can redistribute it and/or
@@ -23,7 +26,7 @@
*
* The Original Code is: all of this file.
*
- * Contributor(s): none yet.
+ * Contributor(s): Marc Freixas, Ken Hughes
*
* ***** END GPL/BL DUAL LICENSE BLOCK *****
*/
@@ -57,6 +60,32 @@
// Merge faces
mergeFaces();
+ /*
+ * HACK: somehow triangular faces are being created with two vertices the
+ * same. If it's happening in BOP_Mesh::replaceVertexIndex() we should
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list