[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [11139] branches/2-44-stable/blender: branches/2-44-stable
Diego Borghetti (Plumiferos)
bdiego at gmail.com
Sun Jul 1 16:12:10 CEST 2007
Revision: 11139
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=11139
Author: bdiego
Date: 2007-07-01 16:12:10 +0200 (Sun, 01 Jul 2007)
Log Message:
-----------
branches/2-44-stable
Merge from trunk:
revision 11070:11071 (Bugfix #6865)
Link: http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=11071
revision 11071:11072 (Bugfix #6883)
Link: https://projects.blender.org/tracker/index.php?func=detail&aid=6883&group_id=9&atid=125
revision 11076:11077
A var was declared twice in the same function, just removing the second declaration.
Link: http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=11077
revision 11079:11080
Link: http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=11080
revision 11090:11091 (Bugfix #6667)
Link: http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=11091
revision 11133:11134 (Bugfix #6847)
Link: http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=11134
revision 11137:11138
Link: http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=11138
Revision Links:
--------------
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=11070
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=11071
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=11076
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=11079
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=11090
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=11133
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=11137
Modified Paths:
--------------
branches/2-44-stable/blender/config/win32-mingw-config.py
branches/2-44-stable/blender/extern/verse/dist/v_connection.c
branches/2-44-stable/blender/extern/verse/dist/v_network.c
branches/2-44-stable/blender/intern/boolop/intern/BOP_BSPNode.cpp
branches/2-44-stable/blender/intern/boolop/intern/BOP_Face2Face.cpp
branches/2-44-stable/blender/intern/boolop/intern/BOP_MathUtils.cpp
branches/2-44-stable/blender/intern/boolop/intern/BOP_Merge.cpp
branches/2-44-stable/blender/intern/ghost/intern/GHOST_WindowX11.cpp
branches/2-44-stable/blender/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
Modified: branches/2-44-stable/blender/config/win32-mingw-config.py
===================================================================
--- branches/2-44-stable/blender/config/win32-mingw-config.py 2007-07-01 08:55:50 UTC (rev 11138)
+++ branches/2-44-stable/blender/config/win32-mingw-config.py 2007-07-01 14:12:10 UTC (rev 11139)
@@ -60,7 +60,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 +108,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 +137,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 +144,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/2-44-stable/blender/extern/verse/dist/v_connection.c
===================================================================
--- branches/2-44-stable/blender/extern/verse/dist/v_connection.c 2007-07-01 08:55:50 UTC (rev 11138)
+++ branches/2-44-stable/blender/extern/verse/dist/v_connection.c 2007-07-01 14:12:10 UTC (rev 11139)
@@ -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/2-44-stable/blender/extern/verse/dist/v_network.c
===================================================================
--- branches/2-44-stable/blender/extern/verse/dist/v_network.c 2007-07-01 08:55:50 UTC (rev 11138)
+++ branches/2-44-stable/blender/extern/verse/dist/v_network.c 2007-07-01 14:12:10 UTC (rev 11139)
@@ -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/2-44-stable/blender/intern/boolop/intern/BOP_BSPNode.cpp
===================================================================
--- branches/2-44-stable/blender/intern/boolop/intern/BOP_BSPNode.cpp 2007-07-01 08:55:50 UTC (rev 11138)
+++ branches/2-44-stable/blender/intern/boolop/intern/BOP_BSPNode.cpp 2007-07-01 14:12:10 UTC (rev 11139)
@@ -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/2-44-stable/blender/intern/boolop/intern/BOP_Face2Face.cpp
===================================================================
--- branches/2-44-stable/blender/intern/boolop/intern/BOP_Face2Face.cpp 2007-07-01 08:55:50 UTC (rev 11138)
+++ branches/2-44-stable/blender/intern/boolop/intern/BOP_Face2Face.cpp 2007-07-01 14:12:10 UTC (rev 11139)
@@ -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 *****
*/
Modified: branches/2-44-stable/blender/intern/boolop/intern/BOP_MathUtils.cpp
===================================================================
--- branches/2-44-stable/blender/intern/boolop/intern/BOP_MathUtils.cpp 2007-07-01 08:55:50 UTC (rev 11138)
+++ branches/2-44-stable/blender/intern/boolop/intern/BOP_MathUtils.cpp 2007-07-01 14:12:10 UTC (rev 11139)
@@ -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/2-44-stable/blender/intern/boolop/intern/BOP_Merge.cpp
===================================================================
--- branches/2-44-stable/blender/intern/boolop/intern/BOP_Merge.cpp 2007-07-01 08:55:50 UTC (rev 11138)
+++ branches/2-44-stable/blender/intern/boolop/intern/BOP_Merge.cpp 2007-07-01 14:12:10 UTC (rev 11139)
@@ -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
+ * be catching it, so either it's not happening there or we aren't
+ * catching it (duh). Until we figure this out, this hack cleans things.
+ *
+ * Test for any invalid faces: if any two vertices are the same of a
+ * triangle, the face is broken. Further, I don't believe it's possible
+ * to have any quads at this point, so if we find one send a message
+ * to stdout.
+ */
+
+ BOP_Faces faces = m_mesh->getFaces();
+ const BOP_IT_Faces ifacesIEnd = (faces.end());
+ for(BOP_IT_Faces faceI=faces.begin();faceI!=ifacesIEnd;faceI++) {
+ if ((*faceI)->getTAG() != BROKEN ) {
+ BOP_Index i1 = (*faceI)->getVertex(0);
+ BOP_Index i2 = (*faceI)->getVertex(1);
+ BOP_Index i3 = (*faceI)->getVertex(2);
+ if ( (*faceI)->size() == 4)
+ cout << "BOP_Merge::mergeFaces found a quad: this is an error" << endl;
+ if (i1 == i2 || i2 == i3 || i3 == i1 )
+ (*faceI)->setTAG(BROKEN);
+ }
+ }
+
do {
// Add quads ...
cont = createQuads();
@@ -592,6 +621,7 @@
// Get mesh faces
BOP_Faces faces = m_mesh->getFaces();
+
// Merge mesh triangles
const BOP_IT_Faces facesIEnd = (faces.end()-1);
Modified: branches/2-44-stable/blender/intern/ghost/intern/GHOST_WindowX11.cpp
===================================================================
--- branches/2-44-stable/blender/intern/ghost/intern/GHOST_WindowX11.cpp 2007-07-01 08:55:50 UTC (rev 11138)
+++ branches/2-44-stable/blender/intern/ghost/intern/GHOST_WindowX11.cpp 2007-07-01 14:12:10 UTC (rev 11139)
@@ -95,6 +95,7 @@
if (m_visual == NULL) {
// barf : no visual meeting these requirements could be found.
+ printf("%s:%d: X11 glxChooseVisual() failed for OpenGL, verify working openGL system!\n", __FILE__, __LINE__);
return;
}
Modified: branches/2-44-stable/blender/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
===================================================================
--- branches/2-44-stable/blender/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp 2007-07-01 08:55:50 UTC (rev 11138)
+++ branches/2-44-stable/blender/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp 2007-07-01 14:12:10 UTC (rev 11139)
@@ -34,10 +34,6 @@
#include <iostream>
#include <math.h>
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#ifdef __linux__
#ifdef __alpha__
#include <signal.h>
@@ -290,7 +286,7 @@
bool fullScreenParFound = false;
bool windowParFound = false;
bool closeConsole = true;
- RAS_IRasterizer::StereoMode stereomode = RAS_IRasterizer::RAS_STEREO_NOSTEREO;
+ RAS_IRasterizer::StereoMode stereomode;
bool stereoWindow = false;
bool stereoParFound = false;
int windowLeft = 100;
@@ -301,7 +297,7 @@
GHOST_TUns32 fullScreenHeight= 0;
int fullScreenBpp = 32;
int fullScreenFrequency = 60;
-
+
#ifdef __linux__
#ifdef __alpha__
signal (SIGFPE, SIG_IGN);
@@ -334,13 +330,10 @@
GEN_init_messaging_system();
// Parse command line options
-#ifdef WIN32
#ifndef NDEBUG
printf("argv[0] = '%s'\n", argv[0]);
#endif
-#endif //WIN32
-
#ifdef WIN32
if (scr_saver_init(argc, argv))
{
@@ -370,11 +363,9 @@
;)
{
-#ifdef WIN32
#ifndef NDEBUG
printf("argv[%d] = '%s' , %i\n", i, argv[i],argc);
#endif
-#endif //WIN32
if (argv[i][0] == '-')
{
switch (argv[i][1])
@@ -397,11 +388,9 @@
SYS_WriteCommandLineInt(syshandle, paramname, atoi(argv[i]));
SYS_WriteCommandLineFloat(syshandle, paramname, atof(argv[i]));
SYS_WriteCommandLineString(syshandle, paramname, argv[i]);
-#ifdef WIN32
#ifndef NDEBUG
printf("%s = '%s'\n", paramname, argv[i]);
#endif
-#endif //WIN32
i++;
}
else
@@ -412,7 +401,7 @@
}
else
{
- SYS_WriteCommandLineInt(syshandle, argv[i++], 1);
+// SYS_WriteCommandLineInt(syshandle, argv[i++], 1);
}
}
}
@@ -533,13 +522,16 @@
printf("error: window size too small.\n");
}
- if (error)
+ if (error || argc == 1)
{
usage(argv[0]);
+ return 0;
}
- else
+
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list