[Bf-blender-cvs] CVS commit: blender SConstruct blender/intern SConscript blender/intern/elbeem/extern elbeem.h blender/source/blender/blenkernel/intern DerivedMesh.c effect.c object.c blender/source/blender/src buttons_object.c fluidsim.c blender/tools btools.py

[Nils Thuerey]

n_t (Nils Thuerey) 2006/08/22 13:18:00 CEST

  Modified files:
    .                    SConstruct 
    blender/intern       SConscript 
    blender/intern/elbeem/extern elbeem.h 
    blender/source/blender/blenkernel/intern DerivedMesh.c 
                                             effect.c object.c 
    blender/source/blender/src buttons_object.c fluidsim.c 
    blender/tools        btools.py 
  
  Log:
  - modified patch #4681, for scons compiling
    of the fluidsim can now be disabled with the
  	flag: BF_NO_ELBEEM='true', e.g. for irix systems.
  	(The number of ifdefs from the original
  	patch was reduced, and the defines are now
  	only necessary when elbeem is switched off.)
  - particle generation option is available again
  
  Revision  Changes    Path
  1.153     +7 -2      blender/SConstruct
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/SConstruct.diff?r1=1.152&r2=1.153&cvsroot=bf-blender>
  1.8       +9 -5      blender/intern/SConscript
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/intern/SConscript.diff?r1=1.7&r2=1.8&cvsroot=bf-blender>
  1.4       +1 -0      blender/intern/elbeem/extern/elbeem.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/intern/elbeem/extern/elbeem.h.diff?r1=1.3&r2=1.4&cvsroot=bf-blender>
  1.123     +11 -3     blender/source/blender/blenkernel/intern/DerivedMesh.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/blenkernel/intern/DerivedMesh.c.diff?r1=1.122&r2=1.123&cvsroot=bf-blender>
  1.98      +14 -10    blender/source/blender/blenkernel/intern/effect.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/blenkernel/intern/effect.c.diff?r1=1.97&r2=1.98&cvsroot=bf-blender>
  1.102     +5 -2      blender/source/blender/blenkernel/intern/object.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/blenkernel/intern/object.c.diff?r1=1.101&r2=1.102&cvsroot=bf-blender>
  1.171     +7 -7      blender/source/blender/src/buttons_object.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/src/buttons_object.c.diff?r1=1.170&r2=1.171&cvsroot=bf-blender>
  1.28      +28 -2     blender/source/blender/src/fluidsim.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/src/fluidsim.c.diff?r1=1.27&r2=1.28&cvsroot=bf-blender>
  1.15      +2 -1      blender/tools/btools.py
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/tools/btools.py.diff?r1=1.14&r2=1.15&cvsroot=bf-blender>