[Soc-2005-cvs] CVS commit: soc-blender/source/blender/blenkernel/intern modifier.c soc-blender/source/blender/makesdna DNA_modifier_types.h soc-blender/source/blender/python/api2_2x point.c point.h

[Chris Want]

hos (Chris Want) 2005/07/27 02:12:15 CEST

  Modified files:
    soc-blender/source/blender/blenkernel/intern modifier.c 
    soc-blender/source/blender/makesdna DNA_modifier_types.h 
    soc-blender/source/blender/python/api2_2x point.c point.h 
  
  Log:
  Post merge conflict-resolution (I hate cvs)
  
  Revision  Changes    Path
  1.3       +258 -10   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.2&r2=1.3&cvsroot=soc-2005>
  1.3       +21 -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.2&r2=1.3&cvsroot=soc-2005>
  1.2       +2 -2      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.1&r2=1.2&cvsroot=soc-2005>
  1.2       +2 -2      soc-blender/source/blender/python/api2_2x/point.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/soc-blender/source/blender/python/api2_2x/point.h.diff?r1=1.1&r2=1.2&cvsroot=soc-2005>