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

[Chris Want]

hos (Chris Want) 2005/08/21 07:02:16 CEST

  Modified files:
    soc-blender/source/blender/blenkernel/intern modifier.c 
    soc-blender/source/blender/src drawarmature.c 
  
  Log:
  Post-merge conflict resolution
  
  Revision  Changes    Path
  1.8       +169 -222  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.7&r2=1.8&cvsroot=soc-2005>
  1.5       +6 -4      soc-blender/source/blender/src/drawarmature.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/soc-blender/source/blender/src/drawarmature.c.diff?r1=1.4&r2=1.5&cvsroot=soc-2005>