[Soc-2005-cvs] CVS commit: soc-blender/intern/elbeem SConscript soc-blender/intern/elbeem/extern LBM_fluidsim.h soc-blender/intern/elbeem/intern blendercall.cpp cfglexer.cpp cfgparser.cpp cfgparser.h elbeem.cpp factory_fsgr.cpp isosurface.cpp isosurface.h lbmdimensions.h lbmfsgrsolver.h ...

[Chris Want]

hos (Chris Want) 2005/10/20 14:25:14 CEST

  Modified files:
    soc-blender/intern/elbeem SConscript 
    soc-blender/intern/elbeem/extern LBM_fluidsim.h 
    soc-blender/intern/elbeem/intern blendercall.cpp cfglexer.cpp 
                                     cfgparser.cpp cfgparser.h 
                                     elbeem.cpp factory_fsgr.cpp 
                                     isosurface.cpp isosurface.h 
                                     lbmdimensions.h 
                                     lbmfsgrsolver.h 
                                     lbminterface.cpp 
                                     lbminterface.h 
                                     ntl_bsptree.cpp ntl_bsptree.h 
                                     ntl_geometryshader.h 
                                     ntl_lightobject.h ntl_ray.cpp 
                                     ntl_raytracer.cpp 
                                     ntl_scene.cpp 
                                     ntl_vector3dim.h 
                                     parametrizer.cpp 
                                     simulation_object.h 
                                     utilities.cpp utilities.h 
    soc-blender/intern/elbeem/make/msvc_7_0 elbeem.vcproj 
    soc-blender/source/blender/blenkernel/intern modifier.c 
    soc-blender/source/blender/makesdna DNA_modifier_types.h 
                                        DNA_object_fluidsim.h 
                                        DNA_scene_types.h 
    soc-blender/source/blender/python/api2_2x Key.c point.c 
    soc-blender/source/blender/python/api2_2x/doc Key.py 
    soc-blender/source/blender/render/intern/source initrender.c 
    soc-blender/source/blender/src buttons_scene.c drawarmature.c 
                                   fluidsim.c seqaudio.c 
  
  Log:
  Easy automated post-merge conflict resolution
  
  Revision  Changes    Path
  1.3       +42 -37    soc-blender/intern/elbeem/SConscript
    <http://projects.blender.org/viewcvs/viewcvs.cgi/soc-blender/intern/elbeem/SConscript.diff?r1=1.2&r2=1.3&cvsroot=soc-2005>
  1.3       +7 -0      soc-blender/intern/elbeem/extern/LBM_fluidsim.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/soc-blender/intern/elbeem/extern/LBM_fluidsim.h.diff?r1=1.2&r2=1.3&cvsroot=soc-2005>
  1.3       +5 -3      soc-blender/intern/elbeem/intern/blendercall.cpp
    <http://projects.blender.org/viewcvs/viewcvs.cgi/soc-blender/intern/elbeem/intern/blendercall.cpp.diff?r1=1.2&r2=1.3&cvsroot=soc-2005>
  1.3       +410 -405  soc-blender/intern/elbeem/intern/cfglexer.cpp
    <http://projects.blender.org/viewcvs/viewcvs.cgi/soc-blender/intern/elbeem/intern/cfglexer.cpp.diff?r1=1.2&r2=1.3&cvsroot=soc-2005>
  1.3       +761 -703  soc-blender/intern/elbeem/intern/cfgparser.cpp
    <http://projects.blender.org/viewcvs/viewcvs.cgi/soc-blender/intern/elbeem/intern/cfgparser.cpp.diff?r1=1.2&r2=1.3&cvsroot=soc-2005>
  1.2       +192 -190  soc-blender/intern/elbeem/intern/cfgparser.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/soc-blender/intern/elbeem/intern/cfgparser.h.diff?r1=1.1&r2=1.2&cvsroot=soc-2005>
  1.3       +0 -4      soc-blender/intern/elbeem/intern/elbeem.cpp
    <http://projects.blender.org/viewcvs/viewcvs.cgi/soc-blender/intern/elbeem/intern/elbeem.cpp.diff?r1=1.2&r2=1.3&cvsroot=soc-2005>
  1.3       +1 -12     soc-blender/intern/elbeem/intern/factory_fsgr.cpp
    <http://projects.blender.org/viewcvs/viewcvs.cgi/soc-blender/intern/elbeem/intern/factory_fsgr.cpp.diff?r1=1.2&r2=1.3&cvsroot=soc-2005>
  1.3       +6 -298    soc-blender/intern/elbeem/intern/isosurface.cpp
    <http://projects.blender.org/viewcvs/viewcvs.cgi/soc-blender/intern/elbeem/intern/isosurface.cpp.diff?r1=1.2&r2=1.3&cvsroot=soc-2005>
  1.3       +0 -119    soc-blender/intern/elbeem/intern/isosurface.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/soc-blender/intern/elbeem/intern/isosurface.h.diff?r1=1.2&r2=1.3&cvsroot=soc-2005>
  1.3       +1 -1      soc-blender/intern/elbeem/intern/lbmdimensions.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/soc-blender/intern/elbeem/intern/lbmdimensions.h.diff?r1=1.2&r2=1.3&cvsroot=soc-2005>
  1.3       +64 -73    soc-blender/intern/elbeem/intern/lbmfsgrsolver.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/soc-blender/intern/elbeem/intern/lbmfsgrsolver.h.diff?r1=1.2&r2=1.3&cvsroot=soc-2005>
  1.3       +2 -2      soc-blender/intern/elbeem/intern/lbminterface.cpp
    <http://projects.blender.org/viewcvs/viewcvs.cgi/soc-blender/intern/elbeem/intern/lbminterface.cpp.diff?r1=1.2&r2=1.3&cvsroot=soc-2005>
  1.3       +9 -9      soc-blender/intern/elbeem/intern/lbminterface.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/soc-blender/intern/elbeem/intern/lbminterface.h.diff?r1=1.2&r2=1.3&cvsroot=soc-2005>
  1.3       +5 -5      soc-blender/intern/elbeem/intern/ntl_bsptree.cpp
    <http://projects.blender.org/viewcvs/viewcvs.cgi/soc-blender/intern/elbeem/intern/ntl_bsptree.cpp.diff?r1=1.2&r2=1.3&cvsroot=soc-2005>
  1.3       +1 -1      soc-blender/intern/elbeem/intern/ntl_bsptree.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/soc-blender/intern/elbeem/intern/ntl_bsptree.h.diff?r1=1.2&r2=1.3&cvsroot=soc-2005>
  1.3       +3 -3      soc-blender/intern/elbeem/intern/ntl_geometryshader.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/soc-blender/intern/elbeem/intern/ntl_geometryshader.h.diff?r1=1.2&r2=1.3&cvsroot=soc-2005>
  1.3       +0 -29     soc-blender/intern/elbeem/intern/ntl_lightobject.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/soc-blender/intern/elbeem/intern/ntl_lightobject.h.diff?r1=1.2&r2=1.3&cvsroot=soc-2005>
  1.3       +6 -13     soc-blender/intern/elbeem/intern/ntl_ray.cpp
    <http://projects.blender.org/viewcvs/viewcvs.cgi/soc-blender/intern/elbeem/intern/ntl_ray.cpp.diff?r1=1.2&r2=1.3&cvsroot=soc-2005>
  1.3       +5 -19     soc-blender/intern/elbeem/intern/ntl_raytracer.cpp
    <http://projects.blender.org/viewcvs/viewcvs.cgi/soc-blender/intern/elbeem/intern/ntl_raytracer.cpp.diff?r1=1.2&r2=1.3&cvsroot=soc-2005>
  1.3       +0 -4      soc-blender/intern/elbeem/intern/ntl_scene.cpp
    <http://projects.blender.org/viewcvs/viewcvs.cgi/soc-blender/intern/elbeem/intern/ntl_scene.cpp.diff?r1=1.2&r2=1.3&cvsroot=soc-2005>
  1.3       +21 -3     soc-blender/intern/elbeem/intern/ntl_vector3dim.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/soc-blender/intern/elbeem/intern/ntl_vector3dim.h.diff?r1=1.2&r2=1.3&cvsroot=soc-2005>
  1.3       +4 -0      soc-blender/intern/elbeem/intern/parametrizer.cpp
    <http://projects.blender.org/viewcvs/viewcvs.cgi/soc-blender/intern/elbeem/intern/parametrizer.cpp.diff?r1=1.2&r2=1.3&cvsroot=soc-2005>
  1.3       +6 -0      soc-blender/intern/elbeem/intern/simulation_object.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/soc-blender/intern/elbeem/intern/simulation_object.h.diff?r1=1.2&r2=1.3&cvsroot=soc-2005>
  1.3       +48 -56    soc-blender/intern/elbeem/intern/utilities.cpp
    <http://projects.blender.org/viewcvs/viewcvs.cgi/soc-blender/intern/elbeem/intern/utilities.cpp.diff?r1=1.2&r2=1.3&cvsroot=soc-2005>
  1.3       +5 -11     soc-blender/intern/elbeem/intern/utilities.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/soc-blender/intern/elbeem/intern/utilities.h.diff?r1=1.2&r2=1.3&cvsroot=soc-2005>
  1.2       +13 -31    soc-blender/intern/elbeem/make/msvc_7_0/elbeem.vcproj
    <http://projects.blender.org/viewcvs/viewcvs.cgi/soc-blender/intern/elbeem/make/msvc_7_0/elbeem.vcproj.diff?r1=1.1&r2=1.2&cvsroot=soc-2005>
  1.13      +55 -17    soc-blender/source/blender/blenkernel/intern/modifier.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/soc-blender/source/blender/blenkernel/intern/modifier.c.diff?r1=1.12&r2=1.13&cvsroot=soc-2005>
  1.7       +3 -1      soc-blender/source/blender/makesdna/DNA_modifier_types.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/soc-blender/source/blender/makesdna/DNA_modifier_types.h.diff?r1=1.6&r2=1.7&cvsroot=soc-2005>
  1.3       +4 -3      soc-blender/source/blender/makesdna/DNA_object_fluidsim.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/soc-blender/source/blender/makesdna/DNA_object_fluidsim.h.diff?r1=1.2&r2=1.3&cvsroot=soc-2005>
  1.3       +4 -1      soc-blender/source/blender/makesdna/DNA_scene_types.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/soc-blender/source/blender/makesdna/DNA_scene_types.h.diff?r1=1.2&r2=1.3&cvsroot=soc-2005>
  1.2       +15 -5     soc-blender/source/blender/python/api2_2x/Key.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/soc-blender/source/blender/python/api2_2x/Key.c.diff?r1=1.1&r2=1.2&cvsroot=soc-2005>
  1.4       +20 -35    soc-blender/source/blender/python/api2_2x/point.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/soc-blender/source/blender/python/api2_2x/point.c.diff?r1=1.3&r2=1.4&cvsroot=soc-2005>
  1.2       +4 -0      soc-blender/source/blender/python/api2_2x/doc/Key.py
    <http://projects.blender.org/viewcvs/viewcvs.cgi/soc-blender/source/blender/python/api2_2x/doc/Key.py.diff?r1=1.1&r2=1.2&cvsroot=soc-2005>
  1.3       +9 -4      soc-blender/source/blender/render/intern/source/initrender.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/soc-blender/source/blender/render/intern/source/initrender.c.diff?r1=1.2&r2=1.3&cvsroot=soc-2005>
  1.3       +22 -20    soc-blender/source/blender/src/buttons_scene.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/soc-blender/source/blender/src/buttons_scene.c.diff?r1=1.2&r2=1.3&cvsroot=soc-2005>
  1.9       +18 -9     soc-blender/source/blender/src/drawarmature.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/soc-blender/source/blender/src/drawarmature.c.diff?r1=1.8&r2=1.9&cvsroot=soc-2005>
  1.2       +130 -51   soc-blender/source/blender/src/fluidsim.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/soc-blender/source/blender/src/fluidsim.c.diff?r1=1.1&r2=1.2&cvsroot=soc-2005>
  1.2       +3 -3      soc-blender/source/blender/src/seqaudio.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/soc-blender/source/blender/src/seqaudio.c.diff?r1=1.1&r2=1.2&cvsroot=soc-2005>