[Soc-2005-cvs] CVS commit: soc-blender/source/blender/blenkernel BKE_modifier.h soc-blender/source/blender/blenkernel/intern modifier.c soc-blender/source/blender/makesdna DNA_scene_types.h soc-blender/source/blender/src drawarmature.c

[Chris Want]

hos (Chris Want) 2005/08/25 03:42:56 CEST

  Modified files:
    soc-blender/source/blender/blenkernel BKE_modifier.h 
    soc-blender/source/blender/blenkernel/intern modifier.c 
    soc-blender/source/blender/makesdna DNA_scene_types.h 
    soc-blender/source/blender/src drawarmature.c 
  
  Log:
  Post-merge conflict resolution
  
  Revision  Changes    Path
  1.6       +1 -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.5&r2=1.6&cvsroot=soc-2005>
  1.9       +69 -41    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.8&r2=1.9&cvsroot=soc-2005>
  1.2       +28 -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.1&r2=1.2&cvsroot=soc-2005>
  1.6       +6 -8      soc-blender/source/blender/src/drawarmature.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/soc-blender/source/blender/src/drawarmature.c.diff?r1=1.5&r2=1.6&cvsroot=soc-2005>