[tuhopuu-cvs] CVS commit: tuhopuu3/doc merge-howto-tuhopuu3.txt tuhopuu3/intern/iksolver/intern IK_QJacobianSolver.cpp tuhopuu3/source/blender/blenkernel BKE_text.h tuhopuu3/source/blender/blenkernel/intern ipo.c mball.c tuhopuu3/source/blender/blenlib/intern arithb.c psfont.c ...

Sat Mar 12 18:51:01 CET 2005

hos (Chris Want) 2005/03/12 18:51:01 CET

  Modified files:
    tuhopuu3/doc         merge-howto-tuhopuu3.txt 
    tuhopuu3/intern/iksolver/intern IK_QJacobianSolver.cpp 
    tuhopuu3/source/blender/blenkernel BKE_text.h 
    tuhopuu3/source/blender/blenkernel/intern ipo.c mball.c 
    tuhopuu3/source/blender/blenlib/intern arithb.c psfont.c 
    tuhopuu3/source/blender/blenloader/intern readfile.c 
                                              writefile.c 
    tuhopuu3/source/blender/include BDR_unwrapper.h BIF_editfont.h 
                                    BIF_resources.h 
    tuhopuu3/source/blender/makesdna DNA_scene_types.h 
    tuhopuu3/source/blender/python/api2_2x Blender.c 
    tuhopuu3/source/blender/render/intern/source rendercore.c 
    tuhopuu3/source/blender/src buttons_editing.c buttons_logic.c 
                                buttons_object.c buttons_scene.c 
                                buttons_shading.c drawipo.c 
                                drawobject.c drawtext.c drawview.c 
                                editaction.c editdeform.c 
                                editface.c editfont.c editipo.c 
                                editmesh_mods.c editobject.c 
                                editscreen.c editsima.c 
                                editsound.c editview.c 
                                header_image.c header_info.c 
                                header_view3d.c headerbuttons.c 
                                interface.c interface_draw.c 
                                interface_panel.c outliner.c 
                                previewrender.c resources.c 
                                space.c toets.c toolbox.c 
                                transform.c transform.h 
                                transform_constraints.c 
                                transform_constraints.h 
                                transform_generics.c 
                                transform_generics.h 
  
  Log:
  Post-merge conflict resolution
  
  Revision  Changes    Path
  1.10      +4 -4      tuhopuu3/doc/merge-howto-tuhopuu3.txt
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/doc/merge-howto-tuhopuu3.txt.diff?r1=1.9&r2=1.10&cvsroot=tuhopuu>
  1.3       +2 -2      tuhopuu3/intern/iksolver/intern/IK_QJacobianSolver.cpp
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/intern/iksolver/intern/IK_QJacobianSolver.cpp.diff?r1=1.2&r2=1.3&cvsroot=tuhopuu>
  1.4       +5 -1      tuhopuu3/source/blender/blenkernel/BKE_text.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/blenkernel/BKE_text.h.diff?r1=1.3&r2=1.4&cvsroot=tuhopuu>
  1.3       +2 -2      tuhopuu3/source/blender/blenkernel/intern/ipo.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/blenkernel/intern/ipo.c.diff?r1=1.2&r2=1.3&cvsroot=tuhopuu>
  1.4       +2 -2      tuhopuu3/source/blender/blenkernel/intern/mball.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/blenkernel/intern/mball.c.diff?r1=1.3&r2=1.4&cvsroot=tuhopuu>
  1.7       +1 -0      tuhopuu3/source/blender/blenlib/intern/arithb.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/blenlib/intern/arithb.c.diff?r1=1.6&r2=1.7&cvsroot=tuhopuu>
  1.3       +2 -2      tuhopuu3/source/blender/blenlib/intern/psfont.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/blenlib/intern/psfont.c.diff?r1=1.2&r2=1.3&cvsroot=tuhopuu>
  1.6       +8 -2      tuhopuu3/source/blender/blenloader/intern/readfile.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/blenloader/intern/readfile.c.diff?r1=1.5&r2=1.6&cvsroot=tuhopuu>
  1.4       +2 -2      tuhopuu3/source/blender/blenloader/intern/writefile.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/blenloader/intern/writefile.c.diff?r1=1.3&r2=1.4&cvsroot=tuhopuu>
  1.4       +5 -5      tuhopuu3/source/blender/include/BDR_unwrapper.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/include/BDR_unwrapper.h.diff?r1=1.3&r2=1.4&cvsroot=tuhopuu>
  1.3       +2 -1      tuhopuu3/source/blender/include/BIF_editfont.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/include/BIF_editfont.h.diff?r1=1.2&r2=1.3&cvsroot=tuhopuu>
  1.7       +27 -4     tuhopuu3/source/blender/include/BIF_resources.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/include/BIF_resources.h.diff?r1=1.6&r2=1.7&cvsroot=tuhopuu>
  1.8       +2 -2      tuhopuu3/source/blender/makesdna/DNA_scene_types.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/makesdna/DNA_scene_types.h.diff?r1=1.7&r2=1.8&cvsroot=tuhopuu>
  1.7       +3 -0      tuhopuu3/source/blender/python/api2_2x/Blender.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/python/api2_2x/Blender.c.diff?r1=1.6&r2=1.7&cvsroot=tuhopuu>
  1.9       +1 -1      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.8&r2=1.9&cvsroot=tuhopuu>
  1.16      +4 -0      tuhopuu3/source/blender/src/buttons_editing.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/buttons_editing.c.diff?r1=1.15&r2=1.16&cvsroot=tuhopuu>
  1.4       +5 -0      tuhopuu3/source/blender/src/buttons_logic.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/buttons_logic.c.diff?r1=1.3&r2=1.4&cvsroot=tuhopuu>
  1.8       +9 -0      tuhopuu3/source/blender/src/buttons_object.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/buttons_object.c.diff?r1=1.7&r2=1.8&cvsroot=tuhopuu>
  1.10      +9 -4      tuhopuu3/source/blender/src/buttons_scene.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/buttons_scene.c.diff?r1=1.9&r2=1.10&cvsroot=tuhopuu>
  1.17      +37 -39    tuhopuu3/source/blender/src/buttons_shading.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/buttons_shading.c.diff?r1=1.16&r2=1.17&cvsroot=tuhopuu>
  1.4       +2 -1      tuhopuu3/source/blender/src/drawipo.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/drawipo.c.diff?r1=1.3&r2=1.4&cvsroot=tuhopuu>
  1.15      +3 -1      tuhopuu3/source/blender/src/drawobject.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/drawobject.c.diff?r1=1.14&r2=1.15&cvsroot=tuhopuu>
  1.4       +7 -1      tuhopuu3/source/blender/src/drawtext.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/drawtext.c.diff?r1=1.3&r2=1.4&cvsroot=tuhopuu>
  1.13      +18 -15    tuhopuu3/source/blender/src/drawview.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/drawview.c.diff?r1=1.12&r2=1.13&cvsroot=tuhopuu>
  1.4       +12 -8     tuhopuu3/source/blender/src/editaction.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/editaction.c.diff?r1=1.3&r2=1.4&cvsroot=tuhopuu>
  1.4       +6 -1      tuhopuu3/source/blender/src/editdeform.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/editdeform.c.diff?r1=1.3&r2=1.4&cvsroot=tuhopuu>
  1.3       +6 -6      tuhopuu3/source/blender/src/editface.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/editface.c.diff?r1=1.2&r2=1.3&cvsroot=tuhopuu>
  1.4       +3 -0      tuhopuu3/source/blender/src/editfont.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/editfont.c.diff?r1=1.3&r2=1.4&cvsroot=tuhopuu>
  1.6       +12 -12    tuhopuu3/source/blender/src/editipo.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/editipo.c.diff?r1=1.5&r2=1.6&cvsroot=tuhopuu>
  1.4       +1 -1      tuhopuu3/source/blender/src/editmesh_mods.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/editmesh_mods.c.diff?r1=1.3&r2=1.4&cvsroot=tuhopuu>
  1.14      +27 -13    tuhopuu3/source/blender/src/editobject.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/editobject.c.diff?r1=1.13&r2=1.14&cvsroot=tuhopuu>
  1.8       +8 -2      tuhopuu3/source/blender/src/editscreen.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/editscreen.c.diff?r1=1.7&r2=1.8&cvsroot=tuhopuu>
  1.8       +7 -1      tuhopuu3/source/blender/src/editsima.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/editsima.c.diff?r1=1.7&r2=1.8&cvsroot=tuhopuu>
  1.9       +3 -3      tuhopuu3/source/blender/src/editsound.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/editsound.c.diff?r1=1.8&r2=1.9&cvsroot=tuhopuu>
  1.7       +6 -5      tuhopuu3/source/blender/src/editview.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/editview.c.diff?r1=1.6&r2=1.7&cvsroot=tuhopuu>
  1.10      +4 -4      tuhopuu3/source/blender/src/header_image.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/header_image.c.diff?r1=1.9&r2=1.10&cvsroot=tuhopuu>
  1.3       +9 -6      tuhopuu3/source/blender/src/header_info.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/header_info.c.diff?r1=1.2&r2=1.3&cvsroot=tuhopuu>
  1.13      +15 -12    tuhopuu3/source/blender/src/header_view3d.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/header_view3d.c.diff?r1=1.12&r2=1.13&cvsroot=tuhopuu>
  1.9       +11 -11    tuhopuu3/source/blender/src/headerbuttons.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/headerbuttons.c.diff?r1=1.8&r2=1.9&cvsroot=tuhopuu>
  1.14      +7 -3      tuhopuu3/source/blender/src/interface.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/interface.c.diff?r1=1.13&r2=1.14&cvsroot=tuhopuu>
  1.14      +6 -2      tuhopuu3/source/blender/src/interface_draw.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/interface_draw.c.diff?r1=1.13&r2=1.14&cvsroot=tuhopuu>
  1.3       +2 -2      tuhopuu3/source/blender/src/interface_panel.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/interface_panel.c.diff?r1=1.2&r2=1.3&cvsroot=tuhopuu>
  1.3       +1 -1      tuhopuu3/source/blender/src/outliner.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/outliner.c.diff?r1=1.2&r2=1.3&cvsroot=tuhopuu>
  1.9       +2 -0      tuhopuu3/source/blender/src/previewrender.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/previewrender.c.diff?r1=1.8&r2=1.9&cvsroot=tuhopuu>
  1.9       +6 -3      tuhopuu3/source/blender/src/resources.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/resources.c.diff?r1=1.8&r2=1.9&cvsroot=tuhopuu>
  1.34      +11 -5     tuhopuu3/source/blender/src/space.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/space.c.diff?r1=1.33&r2=1.34&cvsroot=tuhopuu>
  1.3       +16 -6     tuhopuu3/source/blender/src/toets.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/toets.c.diff?r1=1.2&r2=1.3&cvsroot=tuhopuu>
  1.10      +4 -0      tuhopuu3/source/blender/src/toolbox.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/toolbox.c.diff?r1=1.9&r2=1.10&cvsroot=tuhopuu>
  1.17      +261 -91   tuhopuu3/source/blender/src/transform.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/transform.c.diff?r1=1.16&r2=1.17&cvsroot=tuhopuu>
  1.12      +19 -7     tuhopuu3/source/blender/src/transform.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/transform.h.diff?r1=1.11&r2=1.12&cvsroot=tuhopuu>
  1.14      +253 -45   tuhopuu3/source/blender/src/transform_constraints.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/transform_constraints.c.diff?r1=1.13&r2=1.14&cvsroot=tuhopuu>
  1.8       +5 -1      tuhopuu3/source/blender/src/transform_constraints.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/transform_constraints.h.diff?r1=1.7&r2=1.8&cvsroot=tuhopuu>
  1.11      +48 -57    tuhopuu3/source/blender/src/transform_generics.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/transform_generics.c.diff?r1=1.10&r2=1.11&cvsroot=tuhopuu>
  1.7       +1 -1      tuhopuu3/source/blender/src/transform_generics.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/transform_generics.h.diff?r1=1.6&r2=1.7&cvsroot=tuhopuu>