[tuhopuu-cvs] CVS commit: tuhopuu3/doc merge-howto-tuhopuu3.txt tuhopuu3/intern/iksolver/intern IK_QJacobianSolver.cpp IK_QJacobianSolver.h IK_QChain.cpp IK_QChain.h IK_QSolver_Class.h tuhopuu3/source/blender/blenkernel/bad_level_call_stubs stubs.c tuhopuu3/source/blender/blenloader/intern readfile.c ...

[Chris Want]

hos (Chris Want) 2005/08/29 05:44:42 CEST

  Modified files:
    tuhopuu3/doc         merge-howto-tuhopuu3.txt 
    tuhopuu3/intern/iksolver/intern IK_QJacobianSolver.cpp 
                                    IK_QJacobianSolver.h 
    tuhopuu3/source/blender/blenkernel/bad_level_call_stubs 
                                                            stubs.c 
    tuhopuu3/source/blender/blenloader/intern readfile.c 
    tuhopuu3/source/blender/include butspace.h 
    tuhopuu3/source/blender/makesdna DNA_action_types.h 
    tuhopuu3/source/blender/python/api2_2x Ipocurve.c 
    tuhopuu3/source/blender/render/extern/include render.h 
    tuhopuu3/source/blender/render/intern/source rendercore.c 
    tuhopuu3/source/blender/renderconverter/intern 
                                                   convertBlenderScene.c 
    tuhopuu3/source/blender/src buttons_editing.c buttons_object.c 
                                drawview.c edit.c editarmature.c 
                                outliner.c previewrender.c 
                                transform_constraints.c 
                                transform_conversions.c 
                                transform_generics.c 
                                transform_manipulator.c 
  Removed files:
    tuhopuu3/intern/iksolver/intern IK_QChain.cpp IK_QChain.h 
                                    IK_QSolver_Class.h 
  
  Log:
  Post-merge conflict resolution
  
  Revision  Changes    Path
  1.35      +2 -2      tuhopuu3/doc/merge-howto-tuhopuu3.txt
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/doc/merge-howto-tuhopuu3.txt.diff?r1=1.34&r2=1.35&cvsroot=tuhopuu>
  1.4       +175 -287  tuhopuu3/intern/iksolver/intern/IK_QJacobianSolver.cpp
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/intern/iksolver/intern/IK_QJacobianSolver.cpp.diff?r1=1.3&r2=1.4&cvsroot=tuhopuu>
  1.3       +30 -131   tuhopuu3/intern/iksolver/intern/IK_QJacobianSolver.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/intern/iksolver/intern/IK_QJacobianSolver.h.diff?r1=1.2&r2=1.3&cvsroot=tuhopuu>
  1.12      +14 -23    tuhopuu3/source/blender/blenkernel/bad_level_call_stubs/stubs.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/blenkernel/bad_level_call_stubs/stubs.c.diff?r1=1.11&r2=1.12&cvsroot=tuhopuu>
  1.39      +29 -17    tuhopuu3/source/blender/blenloader/intern/readfile.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/blenloader/intern/readfile.c.diff?r1=1.38&r2=1.39&cvsroot=tuhopuu>
  1.24      +2 -1      tuhopuu3/source/blender/include/butspace.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/include/butspace.h.diff?r1=1.23&r2=1.24&cvsroot=tuhopuu>
  1.6       +19 -5     tuhopuu3/source/blender/makesdna/DNA_action_types.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/makesdna/DNA_action_types.h.diff?r1=1.5&r2=1.6&cvsroot=tuhopuu>
  1.3       +1 -3      tuhopuu3/source/blender/python/api2_2x/Ipocurve.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/python/api2_2x/Ipocurve.c.diff?r1=1.2&r2=1.3&cvsroot=tuhopuu>
  1.7       +8 -1      tuhopuu3/source/blender/render/extern/include/render.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/render/extern/include/render.h.diff?r1=1.6&r2=1.7&cvsroot=tuhopuu>
  1.19      +15 -5     tuhopuu3/source/blender/render/intern/source/rendercore.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/render/intern/source/rendercore.c.diff?r1=1.18&r2=1.19&cvsroot=tuhopuu>
  1.26      +20 -8     tuhopuu3/source/blender/renderconverter/intern/convertBlenderScene.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/renderconverter/intern/convertBlenderScene.c.diff?r1=1.25&r2=1.26&cvsroot=tuhopuu>
  1.57      +69 -8     tuhopuu3/source/blender/src/buttons_editing.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/buttons_editing.c.diff?r1=1.56&r2=1.57&cvsroot=tuhopuu>
  1.41      +25 -21    tuhopuu3/source/blender/src/buttons_object.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/buttons_object.c.diff?r1=1.40&r2=1.41&cvsroot=tuhopuu>
  1.39      +4 -4      tuhopuu3/source/blender/src/drawview.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/drawview.c.diff?r1=1.38&r2=1.39&cvsroot=tuhopuu>
  1.16      +7 -7      tuhopuu3/source/blender/src/edit.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/edit.c.diff?r1=1.15&r2=1.16&cvsroot=tuhopuu>
  1.15      +36 -73    tuhopuu3/source/blender/src/editarmature.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/editarmature.c.diff?r1=1.14&r2=1.15&cvsroot=tuhopuu>
  1.21      +1 -1      tuhopuu3/source/blender/src/outliner.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/outliner.c.diff?r1=1.20&r2=1.21&cvsroot=tuhopuu>
  1.13      +1 -1      tuhopuu3/source/blender/src/previewrender.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/previewrender.c.diff?r1=1.12&r2=1.13&cvsroot=tuhopuu>
  1.32      +22 -25    tuhopuu3/source/blender/src/transform_constraints.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/transform_constraints.c.diff?r1=1.31&r2=1.32&cvsroot=tuhopuu>
  1.22      +5 -5      tuhopuu3/source/blender/src/transform_conversions.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/transform_conversions.c.diff?r1=1.21&r2=1.22&cvsroot=tuhopuu>
  1.32      +28 -13    tuhopuu3/source/blender/src/transform_generics.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/transform_generics.c.diff?r1=1.31&r2=1.32&cvsroot=tuhopuu>
  1.28      +2 -2      tuhopuu3/source/blender/src/transform_manipulator.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/transform_manipulator.c.diff?r1=1.27&r2=1.28&cvsroot=tuhopuu>