[Soc-2005-cvs] CVS commit: soc-blender/intern/iksolver/intern IK_QJacobian.cpp IK_QTask.cpp soc-blender/source/blender/blenkernel/intern modifier.c soc-blender/source/blender/makesdna DNA_modifier_types.h soc-blender/source/blender/src drawarmature.c

[Chris Want]

hos (Chris Want) 2005/09/06 01:06:20 CEST

  Modified files:
    soc-blender/intern/iksolver/intern IK_QJacobian.cpp 
                                       IK_QTask.cpp 
    soc-blender/source/blender/blenkernel/intern modifier.c 
    soc-blender/source/blender/makesdna DNA_modifier_types.h 
    soc-blender/source/blender/src drawarmature.c 
  
  Log:
  Post-merge conflict resolution
  
  Revision  Changes    Path
  1.3       +7 -2      soc-blender/intern/iksolver/intern/IK_QJacobian.cpp
    <http://projects.blender.org/viewcvs/viewcvs.cgi/soc-blender/intern/iksolver/intern/IK_QJacobian.cpp.diff?r1=1.2&r2=1.3&cvsroot=soc-2005>
  1.3       +1 -2      soc-blender/intern/iksolver/intern/IK_QTask.cpp
    <http://projects.blender.org/viewcvs/viewcvs.cgi/soc-blender/intern/iksolver/intern/IK_QTask.cpp.diff?r1=1.2&r2=1.3&cvsroot=soc-2005>
  1.10      +46 -25    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.9&r2=1.10&cvsroot=soc-2005>
  1.6       +13 -0     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.5&r2=1.6&cvsroot=soc-2005>
  1.8       +179 -0    soc-blender/source/blender/src/drawarmature.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/soc-blender/source/blender/src/drawarmature.c.diff?r1=1.7&r2=1.8&cvsroot=soc-2005>