Revision: 22208
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=22208
Author: nexyon
Date: 2009-08-04 09:28:17 +0200 (Tue, 04 Aug 2009)
Log Message:
-----------
Merge with 2.5 branch to revision 22207.
Revision Links:
--------------
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=22207
Modified Paths:
--------------
branches/soundsystem/SConstruct
branches/soundsystem/config/darwin-config.py
branches/soundsystem/intern/smoke/intern/FLUID_3D.cpp
branches/soundsystem/intern/smoke/intern/FLUID_3D_STATIC.cpp
branches/soundsystem/intern/smoke/intern/WAVELET_NOISE.h
branches/soundsystem/make/example_scripts/linux_nanmakefiles.sh
branches/soundsystem/make/example_scripts/sunos_nanmakefiles.sh
branches/soundsystem/release/Makefile
branches/soundsystem/release/ui/buttons_data_modifier.py
branches/soundsystem/release/ui/buttons_material.py
branches/soundsystem/release/ui/buttons_physics_softbody.py
branches/soundsystem/release/ui/buttons_scene.py
branches/soundsystem/release/ui/space_view3d_toolbar.py
branches/soundsystem/source/blender/blenkernel/BKE_mball.h
branches/soundsystem/source/blender/blenkernel/BKE_nla.h
branches/soundsystem/source/blender/blenkernel/BKE_sequence.h
branches/soundsystem/source/blender/blenkernel/BKE_smoke.h
branches/soundsystem/source/blender/blenkernel/BKE_softbody.h
branches/soundsystem/source/blender/blenkernel/CMakeLists.txt
branches/soundsystem/source/blender/blenkernel/SConscript
branches/soundsystem/source/blender/blenkernel/intern/Makefile
branches/soundsystem/source/blender/blenkernel/intern/anim_sys.c
branches/soundsystem/source/blender/blenkernel/intern/mball.c
branches/soundsystem/source/blender/blenkernel/intern/modifier.c
branches/soundsystem/source/blender/blenkernel/intern/nla.c
branches/soundsystem/source/blender/blenkernel/intern/object.c
branches/soundsystem/source/blender/blenkernel/intern/pointcache.c
branches/soundsystem/source/blender/blenkernel/intern/sequence.c
branches/soundsystem/source/blender/blenkernel/intern/smoke.c
branches/soundsystem/source/blender/blenkernel/intern/softbody.c
branches/soundsystem/source/blender/blenloader/intern/readfile.c
branches/soundsystem/source/blender/blenloader/intern/writefile.c
branches/soundsystem/source/blender/editors/animation/anim_channels.c
branches/soundsystem/source/blender/editors/animation/anim_filter.c
branches/soundsystem/source/blender/editors/animation/keyingsets.c
branches/soundsystem/source/blender/editors/include/ED_anim_api.h
branches/soundsystem/source/blender/editors/interface/interface_style.c
branches/soundsystem/source/blender/editors/mesh/editmesh.c
branches/soundsystem/source/blender/editors/object/object_edit.c
branches/soundsystem/source/blender/editors/physics/ed_pointcache.c
branches/soundsystem/source/blender/editors/space_action/action_draw.c
branches/soundsystem/source/blender/editors/space_action/action_header.c
branches/soundsystem/source/blender/editors/space_graph/graph_draw.c
branches/soundsystem/source/blender/editors/space_graph/graph_header.c
branches/soundsystem/source/blender/editors/space_nla/nla_buttons.c
branches/soundsystem/source/blender/editors/space_nla/nla_channels.c
branches/soundsystem/source/blender/editors/space_nla/nla_draw.c
branches/soundsystem/source/blender/editors/space_nla/nla_header.c
branches/soundsystem/source/blender/editors/space_sequencer/sequencer_edit.c
branches/soundsystem/source/blender/editors/space_view3d/drawobject.c
branches/soundsystem/source/blender/editors/space_view3d/view3d_buttons.c
branches/soundsystem/source/blender/makesdna/DNA_action_types.h
branches/soundsystem/source/blender/makesdna/DNA_anim_types.h
branches/soundsystem/source/blender/makesdna/DNA_meta_types.h
branches/soundsystem/source/blender/makesdna/DNA_sequence_types.h
branches/soundsystem/source/blender/makesdna/DNA_smoke_types.h
branches/soundsystem/source/blender/makesdna/DNA_world_types.h
branches/soundsystem/source/blender/makesrna/intern/rna_animation.c
branches/soundsystem/source/blender/makesrna/intern/rna_constraint.c
branches/soundsystem/source/blender/makesrna/intern/rna_curve.c
branches/soundsystem/source/blender/makesrna/intern/rna_material.c
branches/soundsystem/source/blender/makesrna/intern/rna_meta.c
branches/soundsystem/source/blender/makesrna/intern/rna_modifier.c
branches/soundsystem/source/blender/makesrna/intern/rna_object_force.c
branches/soundsystem/source/blender/makesrna/intern/rna_pose.c
branches/soundsystem/source/blender/makesrna/intern/rna_smoke.c
branches/soundsystem/source/blender/makesrna/intern/rna_texture.c
branches/soundsystem/source/blender/render/intern/source/pipeline.c
branches/soundsystem/source/gameengine/BlenderRoutines/Makefile
branches/soundsystem/source/gameengine/Converter/BL_BlenderDataConversion.cpp
branches/soundsystem/source/gameengine/Converter/Makefile
branches/soundsystem/source/gameengine/GamePlayer/common/CMakeLists.txt
branches/soundsystem/source/gameengine/GamePlayer/common/Makefile
branches/soundsystem/source/gameengine/GamePlayer/common/unix/Makefile
branches/soundsystem/source/gameengine/GamePlayer/netscape/src/ketsji/Makefile
branches/soundsystem/source/gameengine/GamePlayer/netscape/src/xpcom/_Blender3DPlugin_implementation_.cpp
branches/soundsystem/source/gameengine/Ketsji/KX_ConstraintActuator.cpp
branches/soundsystem/source/gameengine/Ketsji/KX_GameObject.cpp
branches/soundsystem/source/gameengine/Ketsji/KX_GameObject.h
branches/soundsystem/source/gameengine/Ketsji/KX_Scene.cpp
branches/soundsystem/source/gameengine/Ketsji/KX_Scene.h
branches/soundsystem/source/gameengine/Ketsji/Makefile
branches/soundsystem/source/gameengine/Physics/Dummy/Makefile
branches/soundsystem/source/gameengine/Physics/common/Makefile
branches/soundsystem/source/gameengine/Rasterizer/RAS_BucketManager.cpp
branches/soundsystem/source/nan_compile.mk
branches/soundsystem/source/nan_definitions.mk
branches/soundsystem/source/nan_link.mk
Removed Paths:
-------------
branches/soundsystem/extern/fftw/
branches/soundsystem/release/windows/extra/Python24.zip
branches/soundsystem/release/windows/extra/python25.zip
branches/soundsystem/release/windows/extra/python26.zip
branches/soundsystem/release/windows/extra/python30.zip
branches/soundsystem/release/windows/extra/python31.zip
branches/soundsystem/release/windows/extra/zlib.pyd
Modified: branches/soundsystem/SConstruct
===================================================================
--- branches/soundsystem/SConstruct 2009-08-04 06:40:02 UTC (rev 22207)
+++ branches/soundsystem/SConstruct 2009-08-04 07:28:17 UTC (rev 22208)
@@ -31,6 +31,7 @@
import platform as pltfrm
+# Need a better way to do this. Automagical maybe is not the best thing, maybe
it is.
if pltfrm.architecture()[0] == '64bit':
bitness = 64
else:
@@ -574,8 +575,8 @@
if env['WITH_BF_PYTHON']:
ver = env["BF_PYTHON_VERSION"].replace(".", "")
- dllsources.append('#release/windows/extra/python' + ver +
'.zip')
- dllsources.append('#release/windows/extra/zlib.pyd')
+ dllsources.append('${LCGDIR}/release/python' + ver + '.zip')
+ dllsources.append('${LCGDIR}/release/zlib.pyd')
if env['BF_DEBUG']:
dllsources.append('${BF_PYTHON_LIBPATH}/${BF_PYTHON_LIB}_d.dll')
else:
Modified: branches/soundsystem/config/darwin-config.py
===================================================================
--- branches/soundsystem/config/darwin-config.py 2009-08-04 06:40:02 UTC
(rev 22207)
+++ branches/soundsystem/config/darwin-config.py 2009-08-04 07:28:17 UTC
(rev 22208)
@@ -27,6 +27,8 @@
LCGDIR = '#../lib/darwin-8.x.i386'
LIBDIR = '${LCGDIR}'
+BF_PYTHON_VERSION = '3.1'
+
if MAC_PROC== 'powerpc' and BF_PYTHON_VERSION == '2.3':
MAC_MIN_VERS = '10.3'
MACOSX_SDK='/Developer/SDKs/MacOSX10.3.9.sdk'
@@ -47,8 +49,6 @@
#BF_FFMPEG_LIBPATH='${BF_FFMPEG}/lib'
#BF_FFMPEG_LIB = 'avformat.a avcodec.a avutil.a'
-BF_PYTHON_VERSION = '3.1'
-
if BF_PYTHON_VERSION=='3.1':
# python 3.1 uses precompiled libraries in bf svn /lib by default
Modified: branches/soundsystem/intern/smoke/intern/FLUID_3D.cpp
===================================================================
--- branches/soundsystem/intern/smoke/intern/FLUID_3D.cpp 2009-08-04
06:40:02 UTC (rev 22207)
+++ branches/soundsystem/intern/smoke/intern/FLUID_3D.cpp 2009-08-04
07:28:17 UTC (rev 22208)
@@ -120,29 +120,29 @@
// set side obstacles
int index;
- for (int y = 0; y < _yRes; y++)
+ for (int y = 0; y < _yRes; y++) // z
for (int x = 0; x < _xRes; x++)
{
// front slab
index = x + y * _xRes;
- if(DOMAIN_BC_FRONT==1) _obstacles[index] = 1;
+ if(DOMAIN_BC_BOTTOM==1) _obstacles[index] = 1;
// back slab
index += _totalCells - _slabSize;
- if(DOMAIN_BC_BACK==1) _obstacles[index] = 1;
+ if(DOMAIN_BC_TOP==1) _obstacles[index] = 1;
}
- for (int z = 0; z < _zRes; z++)
+ for (int z = 0; z < _zRes; z++) // y
for (int x = 0; x < _xRes; x++)
{
// bottom slab
index = x + z * _slabSize;
- if(DOMAIN_BC_BOTTOM==1) _obstacles[index] = 1;
+ if(DOMAIN_BC_FRONT==1) _obstacles[index] = 1;
// top slab
index += _slabSize - _xRes;
- if(DOMAIN_BC_TOP==1) _obstacles[index] = 1;
+ if(DOMAIN_BC_BACK==1) _obstacles[index] = 1;
}
- for (int z = 0; z < _zRes; z++)
+ for (int z = 0; z < _zRes; z++) // x
for (int y = 0; y < _yRes; y++)
{
// left slab
@@ -360,12 +360,12 @@
if(DOMAIN_BC_LEFT == 0) setNeumannX(_xVelocity, _res);
else setZeroX(_xVelocity, _res);
- if(DOMAIN_BC_TOP == 0) setNeumannY(_yVelocity, _res);
+ if(DOMAIN_BC_TOP == 0) setNeumannZ(_zVelocity, _res);
+ else setZeroZ(_zVelocity, _res);
+
+ if(DOMAIN_BC_FRONT == 0) setNeumannY(_yVelocity, _res);
else setZeroY(_yVelocity, _res);
- if(DOMAIN_BC_FRONT == 0) setNeumannZ(_zVelocity, _res);
- else setZeroZ(_zVelocity, _res);
-
// calculate divergence
index = _slabSize + _xRes + 1;
for (z = 1; z < _zRes - 1; z++, index += 2 * _xRes)
@@ -630,12 +630,12 @@
if(DOMAIN_BC_LEFT == 0) copyBorderX(_xVelocity, res);
else setZeroX(_xVelocity, res);
- if(DOMAIN_BC_TOP == 0) copyBorderY(_yVelocity, res);
+ if(DOMAIN_BC_TOP == 0) copyBorderZ(_zVelocity, res);
+ else setZeroZ(_zVelocity, res);
+
+ if(DOMAIN_BC_FRONT == 0) copyBorderY(_yVelocity, res);
else setZeroY(_yVelocity, res);
- if(DOMAIN_BC_FRONT == 0) copyBorderZ(_zVelocity, res);
- else setZeroZ(_zVelocity, res);
-
SWAP_POINTERS(_xVelocity, _xVelocityOld);
SWAP_POINTERS(_yVelocity, _yVelocityOld);
SWAP_POINTERS(_zVelocity, _zVelocityOld);
@@ -658,12 +658,12 @@
if(DOMAIN_BC_LEFT == 0) copyBorderX(_xVelocity, res);
else setZeroX(_xVelocity, res);
- if(DOMAIN_BC_TOP == 0) copyBorderY(_yVelocity, res);
+ if(DOMAIN_BC_TOP == 0) copyBorderZ(_zVelocity, res);
+ else setZeroZ(_zVelocity, res);
+
+ if(DOMAIN_BC_FRONT == 0) copyBorderY(_yVelocity, res);
else setZeroY(_yVelocity, res);
- if(DOMAIN_BC_FRONT == 0) copyBorderZ(_zVelocity, res);
- else setZeroZ(_zVelocity, res);
-
setZeroBorder(_density, res);
setZeroBorder(_heat, res);
Modified: branches/soundsystem/intern/smoke/intern/FLUID_3D_STATIC.cpp
===================================================================
--- branches/soundsystem/intern/smoke/intern/FLUID_3D_STATIC.cpp
2009-08-04 06:40:02 UTC (rev 22207)
+++ branches/soundsystem/intern/smoke/intern/FLUID_3D_STATIC.cpp
2009-08-04 07:28:17 UTC (rev 22208)
@@ -104,26 +104,14 @@
for (int z = 0; z < res[2]; z++)
for (int x = 0; x < res[0]; x++)
{
- // bottom slab
+ // front slab
index = x + z * slabSize;
field[index] = field[index + 2 * res[0]];
- // top slab
+ // back slab
index += slabSize - res[0];
field[index] = field[index - 2 * res[0]];
}
-
- // fix, force top slab to only allow outwards flux
- for (int z = 0; z < res[2]; z++)
- for (int x = 0; x < res[0]; x++)
- {
- // top slab
- index = x + z * slabSize;
- index += slabSize - res[0];
- if(field[index]<0.) field[index] = 0.;
- index -= res[0];
- if(field[index]<0.) field[index] = 0.;
- }
}
//////////////////////////////////////////////////////////////////////
@@ -137,14 +125,26 @@
for (int y = 0; y < res[1]; y++)
for (int x = 0; x < res[0]; x++)
{
- // front slab
+ // bottom slab
index = x + y * res[0];
field[index] = field[index + 2 * slabSize];
- // back slab
+ // top slab
index += totalCells - slabSize;
field[index] = field[index - 2 * slabSize];
}
+
+ // fix, force top slab to only allow outwards flux
+ for (int y = 0; y < res[1]; y++)
+ for (int x = 0; x < res[0]; x++)
+ {
+ // top slab
+ index = x + y * res[0];
+ index += totalCells - slabSize;
+ if(field[index]<0.) field[index] = 0.;
+ index -= slabSize;
+ if(field[index]<0.) field[index] = 0.;
+ }
}
//////////////////////////////////////////////////////////////////////
Modified: branches/soundsystem/intern/smoke/intern/WAVELET_NOISE.h
===================================================================
--- branches/soundsystem/intern/smoke/intern/WAVELET_NOISE.h 2009-08-04
06:40:02 UTC (rev 22207)
+++ branches/soundsystem/intern/smoke/intern/WAVELET_NOISE.h 2009-08-04
07:28:17 UTC (rev 22208)
@@ -323,6 +323,7 @@
saveTile(noise3, filename);
delete[] temp13;
delete[] temp23;
+ delete[] noise3;
std::cout <<"Generating new 3d noise done\n";
}
Modified: branches/soundsystem/make/example_scripts/linux_nanmakefiles.sh
===================================================================
--- branches/soundsystem/make/example_scripts/linux_nanmakefiles.sh
2009-08-04 06:40:02 UTC (rev 22207)
+++ branches/soundsystem/make/example_scripts/linux_nanmakefiles.sh
2009-08-04 07:28:17 UTC (rev 22208)
@@ -20,7 +20,7 @@
export NAN_ODE=/usr/local
export NAN_ZLIB=/usr/local
export NAN_FREETYPE=/usr/local
-# CPPFLAGS +=-DMOZ_NOT_NET
+
export NAN_MOZILLA_INC=/usr/local/include/mozilla-1.0.1/
export NAN_MOZILLA_LIB=/usr/local/lib/mozilla-1.0.1/
#export NAN_NSPR=/scratch/irulan/mein/nspr-4.2.2/mozilla/nsprpub/dist/
Modified: branches/soundsystem/make/example_scripts/sunos_nanmakefiles.sh
===================================================================
--- branches/soundsystem/make/example_scripts/sunos_nanmakefiles.sh
2009-08-04 06:40:02 UTC (rev 22207)
+++ branches/soundsystem/make/example_scripts/sunos_nanmakefiles.sh
2009-08-04 07:28:17 UTC (rev 22208)
@@ -17,7 +17,7 @@
export NAN_OPENSSL=/soft/ssl/openssl-0.9.6e
export NAN_ZLIB=/usr/local
export NAN_FREETYPE=/usr/local
-# CPPFLAGS +=-DMOZ_NOT_NET
+
export NAN_MOZILLA_INC=/usr/local/include/mozilla-1.0.1/
export NAN_MOZILLA_LIB=/usr/local/lib/mozilla-1.0.1/
export NAN_NSPR=/scratch/irulan/mein/nspr-4.2.2/mozilla/nsprpub/dist/
Modified: branches/soundsystem/release/Makefile
===================================================================
--- branches/soundsystem/release/Makefile 2009-08-04 06:40:02 UTC (rev
22207)
+++ branches/soundsystem/release/Makefile 2009-08-04 07:28:17 UTC (rev
22208)
@@ -166,6 +166,12 @@
@echo "----> Copy python UI files"
@[ ! -d ui ] || cp -r ui $(CONFDIR)/ui
+
+ ifeq ($(OS),darwin)
+ @echo "----> Copy python modules"
+ @mkdir $(CONFDIR)/python/
+ @unzip -q $(LCGDIR)/release/python.zip -d $(CONFDIR)/python/
+ endif
ifeq ($(OS),darwin)
@echo "----> Move .blender to .app/Contents/MacOS/"
Modified: branches/soundsystem/release/ui/buttons_data_modifier.py
===================================================================
--- branches/soundsystem/release/ui/buttons_data_modifier.py 2009-08-04
06:40:02 UTC (rev 22207)
+++ branches/soundsystem/release/ui/buttons_data_modifier.py 2009-08-04
07:28:17 UTC (rev 22208)
@@ -376,10 +376,9 @@
layout.itemR(md.domain_settings, "coll_group")
elif md.smoke_type == 'TYPE_FLOW':
layout.itemS()
+ layout.itemR(md.flow_settings, "outflow")
layout.itemR(md.flow_settings, "density")
layout.itemR(md.flow_settings, "temperature")
- layout.itemL(text="Velocity")
- layout.row().itemR(md.flow_settings, "velocity",
text="")
layout.item_pointerR(md.flow_settings, "psys", ob,
"particle_systems")
elif md.smoke_type == 'TYPE_COLL':
layout.itemS()
Modified: branches/soundsystem/release/ui/buttons_material.py
===================================================================
--- branches/soundsystem/release/ui/buttons_material.py 2009-08-04 06:40:02 UTC
(rev 22207)
+++ branches/soundsystem/release/ui/buttons_material.py 2009-08-04 07:28:17 UTC
(rev 22208)
@@ -170,6 +170,7 @@
sub = col.column()
sub.active = mat.face_texture
sub.itemR(mat, "face_texture_alpha")
+ col.itemS()
col.itemR(mat, "vertex_color_paint")
col.itemR(mat, "vertex_color_light")
col.itemR(mat, "object_color")
@@ -373,25 +374,29 @@
col = split.column()
col.itemR(raym, "reflect", text="Reflectivity", slider=True)
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
