[Soc-2005-cvs] CVS commit: soc-blender/intern/elbeem COPYING COPYING_trimesh2 Makefile SConscript soc-blender/intern/elbeem/extern LBM_fluidsim.h soc-blender/intern/elbeem/intern Makefile arrays.h attributes.cpp attributes.h blendercall.cpp cfglexer.cpp ...

[Chris Want]

hos (Chris Want) 2005/09/24 21:04:10 CEST

  Modified files:
    soc-blender/source   nan_definitions.mk nan_link.mk 
    soc-blender/source/blender/blenkernel BKE_modifier.h 
    soc-blender/source/blender/blenkernel/intern modifier.c 
    soc-blender/source/blender/python/api2_2x point.c 
    soc-blender/source/blender/src buttons_scene.c imagepaint.c 
  Added files:
    soc-blender/intern/elbeem COPYING COPYING_trimesh2 Makefile 
                              SConscript 
    soc-blender/intern/elbeem/extern LBM_fluidsim.h 
    soc-blender/intern/elbeem/intern Makefile arrays.h 
                                     attributes.cpp attributes.h 
                                     blendercall.cpp cfglexer.cpp 
                                     cfgparser.cpp elbeem.cpp 
                                     factory_fsgr.cpp 
                                     factory_lbm.h globals.h 
                                     isosurface.cpp isosurface.h 
                                     lbmdimensions.h 
                                     lbmfsgrsolver.h 
                                     lbmfunctions.h 
                                     lbminterface.cpp 
                                     lbminterface.h 
                                     mcubes_tables.h 
                                     ntl_blenderdumper.cpp 
                                     ntl_blenderdumper.h 
                                     ntl_bsptree.cpp ntl_bsptree.h 
                                     ntl_geometrybox.cpp 
                                     ntl_geometrybox.h 
                                     ntl_geometryclass.h 
                                     ntl_geometrymodel.cpp 
                                     ntl_geometrymodel.h 
                                     ntl_geometryobject.cpp 
                                     ntl_geometryobject.h 
                                     ntl_geometryshader.h 
                                     ntl_geometrysphere.cpp 
                                     ntl_geometrysphere.h 
                                     ntl_image.cpp ntl_image.h 
                                     ntl_lightobject.cpp 
                                     ntl_lightobject.h 
                                     ntl_material.h ntl_matrices.h 
                                     ntl_ray.cpp ntl_ray.h 
                                     ntl_raytracer.cpp 
                                     ntl_raytracer.h 
                                     ntl_renderglobals.h 
                                     ntl_rndstream.h ntl_scene.cpp 
                                     ntl_scene.h ntl_triangle.h 
                                     ntl_vector3dim.h 
                                     parametrizer.cpp 
                                     parametrizer.h 
                                     particletracer.cpp 
                                     particletracer.h 
                                     simulation_object.cpp 
                                     simulation_object.h 
                                     typeslbm.h utilities.cpp 
                                     utilities.h 
    soc-blender/source/blender/makesdna DNA_object_fluidsim.h 
  Removed files:
    soc-blender/source/blender/include TPT_DependKludge.h 
  
  Log:
  Post-merge conflict resolution
  
  Revision  Changes    Path
  1.3       +4 -3      soc-blender/source/nan_definitions.mk
    <http://projects.blender.org/viewcvs/viewcvs.cgi/soc-blender/source/nan_definitions.mk.diff?r1=1.2&r2=1.3&cvsroot=soc-2005>
  1.2       +6 -2      soc-blender/source/nan_link.mk
    <http://projects.blender.org/viewcvs/viewcvs.cgi/soc-blender/source/nan_link.mk.diff?r1=1.1&r2=1.2&cvsroot=soc-2005>
  1.8       +8 -0      soc-blender/source/blender/blenkernel/BKE_modifier.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/soc-blender/source/blender/blenkernel/BKE_modifier.h.diff?r1=1.7&r2=1.8&cvsroot=soc-2005>
  1.12      +18 -0     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.11&r2=1.12&cvsroot=soc-2005>
  1.3       +1 -1      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.2&r2=1.3&cvsroot=soc-2005>
  1.2       +44 -36    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.1&r2=1.2&cvsroot=soc-2005>
  1.2       +203 -256  soc-blender/source/blender/src/imagepaint.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/soc-blender/source/blender/src/imagepaint.c.diff?r1=1.1&r2=1.2&cvsroot=soc-2005>