Revision: 16951
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=16951
Author: theeth
Date: 2008-10-06 19:37:03 +0200 (Mon, 06 Oct 2008)
Log Message:
-----------
merge runk 16887:16950
Modified Paths:
--------------
branches/harmonic-skeleton/config/linux2-config.py
branches/harmonic-skeleton/doc/blender-scons.txt
branches/harmonic-skeleton/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleIndexVertexArray.cpp
branches/harmonic-skeleton/extern/bullet2/src/BulletSoftBody/btSoftBody.cpp
branches/harmonic-skeleton/extern/bullet2/src/LinearMath/btScalar.h
branches/harmonic-skeleton/extern/ffmpeg/SConscript
branches/harmonic-skeleton/intern/elbeem/intern/mvmcoords.cpp
branches/harmonic-skeleton/release/scripts/vrml97_export.py
branches/harmonic-skeleton/source/blender/blenkernel/BKE_blender.h
branches/harmonic-skeleton/source/blender/blenkernel/BKE_displist.h
branches/harmonic-skeleton/source/blender/blenkernel/BKE_global.h
branches/harmonic-skeleton/source/blender/blenkernel/BKE_writeffmpeg.h
branches/harmonic-skeleton/source/blender/blenkernel/intern/DerivedMesh.c
branches/harmonic-skeleton/source/blender/blenkernel/intern/curve.c
branches/harmonic-skeleton/source/blender/blenkernel/intern/displist.c
branches/harmonic-skeleton/source/blender/blenkernel/intern/exotic.c
branches/harmonic-skeleton/source/blender/blenkernel/intern/fluidsim.c
branches/harmonic-skeleton/source/blender/blenkernel/intern/idprop.c
branches/harmonic-skeleton/source/blender/blenkernel/intern/particle_system.c
branches/harmonic-skeleton/source/blender/blenkernel/intern/pointcache.c
branches/harmonic-skeleton/source/blender/blenkernel/intern/writeffmpeg.c
branches/harmonic-skeleton/source/blender/blenlib/intern/util.c
branches/harmonic-skeleton/source/blender/blenloader/intern/readfile.c
branches/harmonic-skeleton/source/blender/gpu/intern/gpu_codegen.c
branches/harmonic-skeleton/source/blender/gpu/intern/gpu_draw.c
branches/harmonic-skeleton/source/blender/gpu/intern/gpu_material.c
branches/harmonic-skeleton/source/blender/include/BDR_editobject.h
branches/harmonic-skeleton/source/blender/include/BDR_gpencil.h
branches/harmonic-skeleton/source/blender/include/BIF_editaction.h
branches/harmonic-skeleton/source/blender/include/BSE_seqaudio.h
branches/harmonic-skeleton/source/blender/makesdna/DNA_object_fluidsim.h
branches/harmonic-skeleton/source/blender/makesdna/DNA_userdef_types.h
branches/harmonic-skeleton/source/blender/python/BPY_interface.c
branches/harmonic-skeleton/source/blender/python/api2_2x/NMesh.c
branches/harmonic-skeleton/source/blender/python/api2_2x/doc/Object.py
branches/harmonic-skeleton/source/blender/render/intern/source/convertblender.c
branches/harmonic-skeleton/source/blender/src/SConscript
branches/harmonic-skeleton/source/blender/src/autoarmature.c
branches/harmonic-skeleton/source/blender/src/buttons_editing.c
branches/harmonic-skeleton/source/blender/src/buttons_logic.c
branches/harmonic-skeleton/source/blender/src/buttons_scene.c
branches/harmonic-skeleton/source/blender/src/buttons_shading.c
branches/harmonic-skeleton/source/blender/src/drawarmature.c
branches/harmonic-skeleton/source/blender/src/drawgpencil.c
branches/harmonic-skeleton/source/blender/src/drawobject.c
branches/harmonic-skeleton/source/blender/src/drawseq.c
branches/harmonic-skeleton/source/blender/src/drawtext.c
branches/harmonic-skeleton/source/blender/src/drawview.c
branches/harmonic-skeleton/source/blender/src/edit.c
branches/harmonic-skeleton/source/blender/src/editaction_gpencil.c
branches/harmonic-skeleton/source/blender/src/editmesh.c
branches/harmonic-skeleton/source/blender/src/editobject.c
branches/harmonic-skeleton/source/blender/src/editsound.c
branches/harmonic-skeleton/source/blender/src/gpencil.c
branches/harmonic-skeleton/source/blender/src/header_action.c
branches/harmonic-skeleton/source/blender/src/header_view3d.c
branches/harmonic-skeleton/source/blender/src/interface.c
branches/harmonic-skeleton/source/blender/src/retopo.c
branches/harmonic-skeleton/source/blender/src/seqaudio.c
branches/harmonic-skeleton/source/blender/src/space.c
branches/harmonic-skeleton/source/blender/src/toets.c
branches/harmonic-skeleton/source/blender/src/transform_conversions.c
branches/harmonic-skeleton/source/blender/src/transform_manipulator.c
branches/harmonic-skeleton/source/blender/src/usiblender.c
branches/harmonic-skeleton/source/blender/src/view.c
branches/harmonic-skeleton/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
branches/harmonic-skeleton/source/gameengine/Converter/KX_ConvertActuators.cpp
branches/harmonic-skeleton/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
branches/harmonic-skeleton/source/gameengine/Ketsji/KX_PythonInit.cpp
branches/harmonic-skeleton/tools/Blender.py
branches/harmonic-skeleton/tools/btools.py
Modified: branches/harmonic-skeleton/config/linux2-config.py
===================================================================
--- branches/harmonic-skeleton/config/linux2-config.py 2008-10-06 17:15:00 UTC
(rev 16950)
+++ branches/harmonic-skeleton/config/linux2-config.py 2008-10-06 17:37:03 UTC
(rev 16951)
@@ -143,21 +143,21 @@
BF_FFMPEG_INC = '${BF_FFMPEG}/include'
BF_FFMPEG_LIBPATH='${BF_FFMPEG}/lib'
+# enable ogg, vorbis and theora in ffmpeg
+WITH_BF_OGG = 'false' # -DWITH_OGG
+BF_OGG = '/usr'
+BF_OGG_INC = '${BF_OGG}/include'
+BF_OGG_LIB = 'ogg vorbis theoraenc theoradec'
+
WITH_BF_OPENJPEG = 'true'
BF_OPENJPEG = '#extern/libopenjpeg'
BF_OPENJPEG_LIB = ''
-# Uncomment the following two lines to use system's ffmpeg
-# BF_FFMPEG = '/usr'
-# BF_FFMPEG_LIB = 'avformat avcodec swscale avutil'
BF_OPENJPEG_INC = '${BF_OPENJPEG}/include'
BF_OPENJPEG_LIBPATH='${BF_OPENJPEG}/lib'
WITH_BF_REDCODE = 'false'
BF_REDCODE = '#extern/libredcode'
BF_REDCODE_LIB = ''
-# Uncomment the following two lines to use system's ffmpeg
-# BF_FFMPEG = '/usr'
-# BF_FFMPEG_LIB = 'avformat avcodec swscale avutil'
BF_REDCODE_INC = '${BF_REDCODE}/include'
BF_REDCODE_LIBPATH='${BF_REDCODE}/lib'
Modified: branches/harmonic-skeleton/doc/blender-scons.txt
===================================================================
--- branches/harmonic-skeleton/doc/blender-scons.txt 2008-10-06 17:15:00 UTC
(rev 16950)
+++ branches/harmonic-skeleton/doc/blender-scons.txt 2008-10-06 17:37:03 UTC
(rev 16951)
@@ -58,7 +58,14 @@
$BLENDERHOME/config/(platform)-config.py. After the build successfully
completes, you can find everything you need in BF_INSTALLDIR.
+ If you want to create the installer package of Blender on Windows you'll
+ need to install nullsoft scriptable install system from http://nsis.sf.net.
+ As an extra dependency, you need the MoreInfo plugin too. The creation of
+ the installer is tied into the build process and can be triggered with:
+ % scons nsis
+
+
Configuring the build
---------------------
@@ -166,18 +173,6 @@
debug symbols. Also note that BF_QUICKDEBUG and BF_DEBUG_LIBS are
combined;
for example, setting BF_QUICKDEBUG won't overwrite the contents of
BF_DEBUG_LIBS.
-
- Not installing
- --------------
-
- If you dont want to install the build result, you can use the following
option either
- on the commandline or in your user-config.py :
-
- WITHOUT_BF_INSTALL='true'
-
- by default, this is set to 'false', and so the build is installed
-
-
Supported toolset
-----------------
@@ -194,7 +189,6 @@
specify what toolset to use
% scons BF_TOOLSET=msvc
- % scons BF_TOOLSET=mstoolkit
% scons BF_TOOLSET=mingw
If you have only the toolkit installed, you will also need to give
Modified:
branches/harmonic-skeleton/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleIndexVertexArray.cpp
===================================================================
---
branches/harmonic-skeleton/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleIndexVertexArray.cpp
2008-10-06 17:15:00 UTC (rev 16950)
+++
branches/harmonic-skeleton/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleIndexVertexArray.cpp
2008-10-06 17:37:03 UTC (rev 16951)
@@ -16,6 +16,7 @@
#include "btTriangleIndexVertexArray.h"
btTriangleIndexVertexArray::btTriangleIndexVertexArray(int numTriangles,int*
triangleIndexBase,int triangleIndexStride,int numVertices,btScalar*
vertexBase,int vertexStride)
+: m_hasAabb(0)
{
btIndexedMesh mesh;
Modified:
branches/harmonic-skeleton/extern/bullet2/src/BulletSoftBody/btSoftBody.cpp
===================================================================
--- branches/harmonic-skeleton/extern/bullet2/src/BulletSoftBody/btSoftBody.cpp
2008-10-06 17:15:00 UTC (rev 16950)
+++ branches/harmonic-skeleton/extern/bullet2/src/BulletSoftBody/btSoftBody.cpp
2008-10-06 17:37:03 UTC (rev 16951)
@@ -2439,6 +2439,10 @@
for(int i=0,ni=psb->m_rcontacts.size();i<ni;++i)
{
const RContact& c=psb->m_rcontacts[i];
+ ///skip object that don't have collision response
+ if
(!psb->getWorldInfo()->m_dispatcher->needsResponse(psb,c.m_cti.m_body))
+ continue;
+
const sCti& cti=c.m_cti;
const btVector3
va=cti.m_body->getVelocityInLocalPoint(c.m_c1)*dt;
const btVector3 vb=c.m_node->m_x-c.m_node->m_q;
Modified: branches/harmonic-skeleton/extern/bullet2/src/LinearMath/btScalar.h
===================================================================
--- branches/harmonic-skeleton/extern/bullet2/src/LinearMath/btScalar.h
2008-10-06 17:15:00 UTC (rev 16950)
+++ branches/harmonic-skeleton/extern/bullet2/src/LinearMath/btScalar.h
2008-10-06 17:37:03 UTC (rev 16951)
@@ -141,6 +141,10 @@
/// older compilers (gcc 3.x) and Sun needs double version of sqrt etc.
/// exclude Apple Intel (i's assumed to be a Macbook or new Intel Dual Core
Processor)
#if defined (__sun) || defined (__sun__) || defined (__sparc) || (defined
(__APPLE__) && ! defined (__i386__))
+/* XXX Need to fix these... needed for SunOS 5.8 */
+#define sinf(a) sin((double)(a))
+#define cosf(a) cos((double)(a))
+#define fabsf(a) fabs((double)(a))
//use slow double float precision operation on those platforms
#ifndef BT_USE_DOUBLE_PRECISION
#define BT_FORCE_DOUBLE_FUNCTIONS
Modified: branches/harmonic-skeleton/extern/ffmpeg/SConscript
===================================================================
--- branches/harmonic-skeleton/extern/ffmpeg/SConscript 2008-10-06 17:15:00 UTC
(rev 16950)
+++ branches/harmonic-skeleton/extern/ffmpeg/SConscript 2008-10-06 17:37:03 UTC
(rev 16951)
@@ -11,9 +11,13 @@
else:
ffmpeg_switches = "--disable-shared --enable-liba52bin --enable-gpl
--disable-network --disable-zlib --disable-vhook --disable-ffserver
--disable-ffplay --enable-swscaler --enable-memalign-hack --enable-libx264
--enable-libxvid --enable-libmp3lame"
+if env['WITH_BF_OGG']:
+ ffmpeg_switches += " --enable-libogg --enable-libtheora --enable-libvorbis"
+
#--enable-libx264
extra_variables = { }
extra_includes = [ "../x264", "../xvidcore/src", "../libmp3lame" ]
+#
import sys
import os
Modified: branches/harmonic-skeleton/intern/elbeem/intern/mvmcoords.cpp
===================================================================
--- branches/harmonic-skeleton/intern/elbeem/intern/mvmcoords.cpp
2008-10-06 17:15:00 UTC (rev 16950)
+++ branches/harmonic-skeleton/intern/elbeem/intern/mvmcoords.cpp
2008-10-06 17:37:03 UTC (rev 16951)
@@ -98,9 +98,9 @@
if(mvmFullDebug)
errMsg("MeanValueMeshCoords::computeWeights","c="<<c<<" phi="<<phi<<" d="<<d);
//if (c[0] > 1. || c[0] < 0. || c[1] > 1. || c[1] < 0. || c[2]
> 1. || c[2] < 0.) continue;
- s[0] = sqrtf((float)(1.-c[0]*c[0]));
- s[1] = sqrtf((float)(1.-c[1]*c[1]));
- s[2] = sqrtf((float)(1.-c[2]*c[2]));
+ s[0] = sqrt((float)(1.-c[0]*c[0]));
+ s[1] = sqrt((float)(1.-c[1]*c[1]));
+ s[2] = sqrt((float)(1.-c[2]*c[2]));
if(mvmFullDebug)
errMsg("MeanValueMeshCoords::computeWeights","s");
if (s[0] <= cEPS || s[1] <= cEPS || s[2] <= cEPS) {
Modified: branches/harmonic-skeleton/release/scripts/vrml97_export.py
===================================================================
--- branches/harmonic-skeleton/release/scripts/vrml97_export.py 2008-10-06
17:15:00 UTC (rev 16950)
+++ branches/harmonic-skeleton/release/scripts/vrml97_export.py 2008-10-06
17:37:03 UTC (rev 16951)
@@ -206,7 +206,7 @@
if scene != inlines[0]:
return
else:
- for i in range(allinlines):
+ for i in xrange(allinlines):
nameinline=inlines[i].getName()
if (nameinline not in self.namesStandard) and
(i > 0):
self.writeIndented("DEF %s Inline {\n"
% \
@@ -219,7 +219,7 @@
def writeScript(self):
textEditor = Blender.Text.Get()
alltext = len(textEditor)
- for i in range(alltext):
+ for i in xrange(alltext):
nametext = textEditor[i].getName()
nlines = textEditor[i].getNLines()
if (self.proto == 1):
@@ -227,14 +227,14 @@
nametext == "proto.txt") and (nlines !=
None):
nalllines = len(textEditor[i].asLines())
alllines = textEditor[i].asLines()
- for j in range(nalllines):
+ for j in xrange(nalllines):
self.writeIndented(alllines[j]
+ "\n")
elif (self.proto == 0):
if (nametext == "route" or nametext ==
"route.js" or \
nametext == "route.txt") and (nlines !=
None):
nalllines = len(textEditor[i].asLines())
alllines = textEditor[i].asLines()
- for j in range(nalllines):
+ for j in xrange(nalllines):
self.writeIndented(alllines[j]
+ "\n")
self.writeIndented("\n")
@@ -556,31 +556,28 @@
issmooth = 0
maters = me.materials
- nummats = self.getNumMaterials(me)
+ nummats = len(me.materials)
# Vertex and Face colors trump materials and image textures
if (self.facecolors or self.vcolors):
if nummats > 0:
- if maters[0]:
- self.writeShape(ob, me, 0, None)
- else:
- self.writeShape(ob, me, -1, None)
+ self.writeShape(ob, me, 0, None)
else:
self.writeShape(ob, me, -1, None)
- # Do meshes with materials, possible with image textures
+
+ # Do meshes with materials, possibly with image textures
elif nummats > 0:
- for matnum in range(len(maters)):
- if maters[matnum]:
- images = []
- if me.faceUV:
- images = self.getImages(me,
matnum)
- if len(images) > 0:
- for image in images:
-
self.writeShape(ob, me, matnum, image)
- else:
- self.writeShape(ob, me,
matnum, None)
+ for matnum in xrange(len(maters)):
+ images = []
+ if me.faceUV:
+ images = self.getImages(me, matnum)
+ if len(images) > 0:
+ for image in images:
+ self.writeShape(ob, me,
matnum, image)
else:
self.writeShape(ob, me, matnum,
None)
+ else:
+ self.writeShape(ob, me, matnum, None)
else:
if me.faceUV:
images = self.getImages(me, -1)
@@ -608,15 +605,6 @@
imageNames[imName]=1
return images
- def getNumMaterials(self, me):
- # Oh silly Blender, why do you sometimes have 'None' as
- # a member of the me.materials array?
- num = 0
- for mat in me.materials:
- if mat:
- num = num + 1
- return num
-
def writeCoordinates(self, me, meshName):
coordName = "coord_%s" % (meshName)
# look up coord name, use it if available
@@ -644,20 +632,43 @@
self.writeIndented("}\n", -1)
self.writeIndented("\n")
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
