[Soc-2005-cvs] CVS commit: soc-blender/intern/iksolver/intern IK_QJacobian.cpp IK_QJacobian.h IK_QTask.cpp IK_QTask.h IK_QChain.cpp IK_QChain.h IK_QSolver_Class.h soc-blender/source/blender/render/intern/source initrender.c soc-blender/source/blender/src drawarmature.c

[Chris Want]

hos (Chris Want) 2005/08/29 05:12:48 CEST

  Modified files:
    soc-blender/source/blender/render/intern/source initrender.c 
    soc-blender/source/blender/src drawarmature.c 
  Added files:
    soc-blender/intern/iksolver/intern IK_QJacobian.cpp 
                                       IK_QJacobian.h IK_QTask.cpp 
                                       IK_QTask.h 
  Removed files:
    soc-blender/intern/iksolver/intern IK_QChain.cpp IK_QChain.h 
                                       IK_QSolver_Class.h 
  
  Log:
  Post-merge conflict resolution
  
  Revision  Changes    Path
  1.2       +3 -7      soc-blender/source/blender/render/intern/source/initrender.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/soc-blender/source/blender/render/intern/source/initrender.c.diff?r1=1.1&r2=1.2&cvsroot=soc-2005>
  1.7       +83 -33    soc-blender/source/blender/src/drawarmature.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/soc-blender/source/blender/src/drawarmature.c.diff?r1=1.6&r2=1.7&cvsroot=soc-2005>