[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [11180] branches/particles: Merge from trunk: revisions 11056-11172
Janne Karhu
janne.karhu at utu.fi
Fri Jul 6 06:12:08 CEST 2007
Revision: 11180
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=11180
Author: jhk
Date: 2007-07-06 06:12:07 +0200 (Fri, 06 Jul 2007)
Log Message:
-----------
Merge from trunk: revisions 11056-11172
Modified Paths:
--------------
branches/particles/bin/.blender/locale/it/LC_MESSAGES/blender.mo
branches/particles/config/win32-mingw-config.py
branches/particles/extern/verse/dist/v_connection.c
branches/particles/extern/verse/dist/v_network.c
branches/particles/intern/boolop/intern/BOP_BSPNode.cpp
branches/particles/intern/boolop/intern/BOP_Face2Face.cpp
branches/particles/intern/boolop/intern/BOP_MathUtils.cpp
branches/particles/intern/boolop/intern/BOP_Merge.cpp
branches/particles/intern/ghost/intern/GHOST_WindowX11.cpp
branches/particles/intern/make/msvc_7_0/intern.sln
branches/particles/po/it.po
branches/particles/release/datafiles/blenderbuttons
branches/particles/release/scripts/object_random_loc_sz_rot.py
branches/particles/source/blender/blenkernel/BKE_verse.h
branches/particles/source/blender/blenkernel/intern/constraint.c
branches/particles/source/blender/blenkernel/intern/object.c
branches/particles/source/blender/blenkernel/intern/verse_geometry_node.c
branches/particles/source/blender/blenlib/BLI_arithb.h
branches/particles/source/blender/blenlib/intern/arithb.c
branches/particles/source/blender/blenloader/intern/readfile.c
branches/particles/source/blender/blenloader/intern/writefile.c
branches/particles/source/blender/include/BIF_editaction.h
branches/particles/source/blender/include/BIF_editseq.h
branches/particles/source/blender/include/BIF_resources.h
branches/particles/source/blender/include/BSE_editaction_types.h
branches/particles/source/blender/include/blendef.h
branches/particles/source/blender/python/api2_2x/BezTriple.c
branches/particles/source/blender/python/api2_2x/Camera.c
branches/particles/source/blender/python/api2_2x/Constraint.c
branches/particles/source/blender/python/api2_2x/CurNurb.c
branches/particles/source/blender/python/api2_2x/Curve.c
branches/particles/source/blender/python/api2_2x/Effect.c
branches/particles/source/blender/python/api2_2x/Font.c
branches/particles/source/blender/python/api2_2x/Group.c
branches/particles/source/blender/python/api2_2x/Image.c
branches/particles/source/blender/python/api2_2x/Ipo.c
branches/particles/source/blender/python/api2_2x/Ipocurve.c
branches/particles/source/blender/python/api2_2x/Lamp.c
branches/particles/source/blender/python/api2_2x/Lattice.c
branches/particles/source/blender/python/api2_2x/Material.c
branches/particles/source/blender/python/api2_2x/Mesh.c
branches/particles/source/blender/python/api2_2x/Metaball.c
branches/particles/source/blender/python/api2_2x/Modifier.c
branches/particles/source/blender/python/api2_2x/NMesh.c
branches/particles/source/blender/python/api2_2x/Object.c
branches/particles/source/blender/python/api2_2x/Scene.c
branches/particles/source/blender/python/api2_2x/Sound.c
branches/particles/source/blender/python/api2_2x/Text.c
branches/particles/source/blender/python/api2_2x/Text3d.c
branches/particles/source/blender/python/api2_2x/Texture.c
branches/particles/source/blender/python/api2_2x/World.c
branches/particles/source/blender/python/api2_2x/bpy_config.c
branches/particles/source/blender/python/api2_2x/doc/Ipo.py
branches/particles/source/blender/python/api2_2x/gen_utils.c
branches/particles/source/blender/python/api2_2x/logic.c
branches/particles/source/blender/python/api2_2x/rgbTuple.c
branches/particles/source/blender/python/api2_2x/sceneRender.c
branches/particles/source/blender/python/api2_2x/sceneSequence.c
branches/particles/source/blender/python/api2_2x/windowTheme.c
branches/particles/source/blender/src/blenderbuttons.c
branches/particles/source/blender/src/drawaction.c
branches/particles/source/blender/src/drawimage.c
branches/particles/source/blender/src/drawipo.c
branches/particles/source/blender/src/drawnla.c
branches/particles/source/blender/src/editaction.c
branches/particles/source/blender/src/editarmature.c
branches/particles/source/blender/src/editdeform.c
branches/particles/source/blender/src/editipo.c
branches/particles/source/blender/src/editipo_mods.c
branches/particles/source/blender/src/editmesh_tools.c
branches/particles/source/blender/src/editnode.c
branches/particles/source/blender/src/editseq.c
branches/particles/source/blender/src/header_info.c
branches/particles/source/blender/src/header_ipo.c
branches/particles/source/blender/src/header_seq.c
branches/particles/source/blender/src/header_view3d.c
branches/particles/source/blender/src/space.c
branches/particles/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
Added Paths:
-----------
branches/particles/release/scripts/add_mesh_empty.py
Removed Paths:
-------------
branches/particles/intern/action/
branches/particles/intern/csg/
branches/particles/intern/keymaker/
Modified: branches/particles/bin/.blender/locale/it/LC_MESSAGES/blender.mo
===================================================================
(Binary files differ)
Modified: branches/particles/config/win32-mingw-config.py
===================================================================
--- branches/particles/config/win32-mingw-config.py 2007-07-06 04:03:57 UTC (rev 11179)
+++ branches/particles/config/win32-mingw-config.py 2007-07-06 04:12:07 UTC (rev 11180)
@@ -62,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'
@@ -111,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'
@@ -143,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' ]
@@ -152,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/particles/extern/verse/dist/v_connection.c
===================================================================
--- branches/particles/extern/verse/dist/v_connection.c 2007-07-06 04:03:57 UTC (rev 11179)
+++ branches/particles/extern/verse/dist/v_connection.c 2007-07-06 04:12:07 UTC (rev 11180)
@@ -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/particles/extern/verse/dist/v_network.c
===================================================================
--- branches/particles/extern/verse/dist/v_network.c 2007-07-06 04:03:57 UTC (rev 11179)
+++ branches/particles/extern/verse/dist/v_network.c 2007-07-06 04:12:07 UTC (rev 11180)
@@ -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/particles/intern/boolop/intern/BOP_BSPNode.cpp
===================================================================
--- branches/particles/intern/boolop/intern/BOP_BSPNode.cpp 2007-07-06 04:03:57 UTC (rev 11179)
+++ branches/particles/intern/boolop/intern/BOP_BSPNode.cpp 2007-07-06 04:12:07 UTC (rev 11180)
@@ -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/particles/intern/boolop/intern/BOP_Face2Face.cpp
===================================================================
--- branches/particles/intern/boolop/intern/BOP_Face2Face.cpp 2007-07-06 04:03:57 UTC (rev 11179)
+++ branches/particles/intern/boolop/intern/BOP_Face2Face.cpp 2007-07-06 04:12:07 UTC (rev 11180)
@@ -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/particles/intern/boolop/intern/BOP_MathUtils.cpp
===================================================================
--- branches/particles/intern/boolop/intern/BOP_MathUtils.cpp 2007-07-06 04:03:57 UTC (rev 11179)
+++ branches/particles/intern/boolop/intern/BOP_MathUtils.cpp 2007-07-06 04:12:07 UTC (rev 11180)
@@ -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/particles/intern/boolop/intern/BOP_Merge.cpp
===================================================================
--- branches/particles/intern/boolop/intern/BOP_Merge.cpp 2007-07-06 04:03:57 UTC (rev 11179)
+++ branches/particles/intern/boolop/intern/BOP_Merge.cpp 2007-07-06 04:12:07 UTC (rev 11180)
@@ -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/particles/intern/ghost/intern/GHOST_WindowX11.cpp
===================================================================
--- branches/particles/intern/ghost/intern/GHOST_WindowX11.cpp 2007-07-06 04:03:57 UTC (rev 11179)
+++ branches/particles/intern/ghost/intern/GHOST_WindowX11.cpp 2007-07-06 04:12:07 UTC (rev 11180)
@@ -168,6 +168,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/particles/intern/make/msvc_7_0/intern.sln
===================================================================
--- branches/particles/intern/make/msvc_7_0/intern.sln 2007-07-06 04:03:57 UTC (rev 11179)
+++ branches/particles/intern/make/msvc_7_0/intern.sln 2007-07-06 04:12:07 UTC (rev 11180)
@@ -8,7 +8,6 @@
{B093415D-C0F6-4E76-8F5A-6BC1917BCE9E} = {B093415D-C0F6-4E76-8F5A-6BC1917BCE9E}
{E784098D-3ED8-433A-9353-9679415DDDC5} = {E784098D-3ED8-433A-9353-9679415DDDC5}
{76D90B92-ECC7-409C-9F98-A8814B90F3C0} = {76D90B92-ECC7-409C-9F98-A8814B90F3C0}
- {121EC196-8E8A-4937-B0BD-0F114C87D55E} = {121EC196-8E8A-4937-B0BD-0F114C87D55E}
{542A9FA1-B7FF-441C-AE15-054DB31D3488} = {542A9FA1-B7FF-441C-AE15-054DB31D3488}
{213356A9-3A1F-41DA-9819-1297BCD17DEE} = {213356A9-3A1F-41DA-9819-1297BCD17DEE}
{51A348C1-8684-4D67-B980-97B1FC74159B} = {51A348C1-8684-4D67-B980-97B1FC74159B}
@@ -24,10 +23,6 @@
ProjectSection(ProjectDependencies) = postProject
EndProjectSection
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "blenkey", "..\..\keymaker\make\msvc_7_0\blenkey.vcproj", "{121EC196-8E8A-4937-B0BD-0F114C87D55E}"
- ProjectSection(ProjectDependencies) = postProject
- EndProjectSection
-EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bmfont", "..\..\bmfont\make\msvc_7_0\bmfont.vcproj", "{E784098D-3ED8-433A-9353-9679415DDDC5}"
ProjectSection(ProjectDependencies) = postProject
EndProjectSection
@@ -110,6 +105,8 @@
Blender Debug = Blender Debug
Blender Release = Blender Release
EndGlobalSection
+ GlobalSection(ProjectDependencies) = postSolution
+ EndGlobalSection
GlobalSection(ProjectConfiguration) = postSolution
{02110D03-59DB-4571-8787-72B3C03B2F2D}.3DPlugin Debug.ActiveCfg = 3DPlugin Debug|Win32
{02110D03-59DB-4571-8787-72B3C03B2F2D}.3DPlugin Debug.Build.0 = 3DPlugin Debug|Win32
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list