[tuhopuu-cvs] CVS commit: tuhopuu3/doc merge-howto-tuhopuu3.txt tuhopuu3/projectfiles/blender/src BL_src.dsp tuhopuu3/source/blender/blenkernel BKE_global.h tuhopuu3/source/blender/blenkernel/bad_level_call_stubs stubs.c tuhopuu3/source/blender/blenkernel/intern blender.c ipo.c lattice.c object.c scene.c text.c ...

Sun May 15 17:33:52 CEST 2005

hos (Chris Want) 2005/05/15 17:33:51 CEST

  Modified files:
    tuhopuu3/doc         merge-howto-tuhopuu3.txt 
    tuhopuu3/projectfiles/blender/src BL_src.dsp 
    tuhopuu3/source/blender/blenkernel BKE_global.h 
    tuhopuu3/source/blender/blenkernel/bad_level_call_stubs 
                                                            stubs.c 
    tuhopuu3/source/blender/blenkernel/intern blender.c ipo.c 
                                              lattice.c object.c 
                                              scene.c text.c 
    tuhopuu3/source/blender/blenloader/intern readfile.c 
                                              writefile.c 
    tuhopuu3/source/blender/include BIF_drawtext.h BIF_resources.h 
                                    BIF_transform.h blendef.h 
    tuhopuu3/source/blender/makesdna DNA_screen_types.h 
                                     DNA_space_types.h 
                                     DNA_text_types.h 
    tuhopuu3/source/blender/python/api2_2x Blender.c windowTheme.c 
    tuhopuu3/source/blender/renderconverter/intern 
                                                   convertBlenderScene.c 
    tuhopuu3/source/blender/src buttons_editing.c buttons_object.c 
                                buttons_scene.c buttons_script.c 
                                drawipo.c drawtext.c drawview.c 
                                editface.c editipo.c editmball.c 
                                editmesh_tools.c editobject.c 
                                editscreen.c editview.c filesel.c 
                                header_text.c header_view3d.c 
                                headerbuttons.c interface.c 
                                resources.c space.c toolbox.c 
                                transform.c 
                                transform_constraints.c 
                                transform_conversions.c 
                                transform_generics.c 
                                transform_manipulator.c 
                                usiblender.c view.c vpaint.c 
  
  Log:
  Post-merge conflict resolution
  
  Revision  Changes    Path
  1.20      +2 -4      tuhopuu3/doc/merge-howto-tuhopuu3.txt
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/doc/merge-howto-tuhopuu3.txt.diff?r1=1.19&r2=1.20&cvsroot=tuhopuu>
  1.10      +16 -0     tuhopuu3/projectfiles/blender/src/BL_src.dsp
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/projectfiles/blender/src/BL_src.dsp.diff?r1=1.9&r2=1.10&cvsroot=tuhopuu>
  1.11      +1 -1      tuhopuu3/source/blender/blenkernel/BKE_global.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/blenkernel/BKE_global.h.diff?r1=1.10&r2=1.11&cvsroot=tuhopuu>
  1.7       +2 -1      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.6&r2=1.7&cvsroot=tuhopuu>
  1.4       +4 -5      tuhopuu3/source/blender/blenkernel/intern/blender.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/blenkernel/intern/blender.c.diff?r1=1.3&r2=1.4&cvsroot=tuhopuu>
  1.6       +14 -0     tuhopuu3/source/blender/blenkernel/intern/ipo.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/blenkernel/intern/ipo.c.diff?r1=1.5&r2=1.6&cvsroot=tuhopuu>
  1.8       +13 -2     tuhopuu3/source/blender/blenkernel/intern/lattice.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/blenkernel/intern/lattice.c.diff?r1=1.7&r2=1.8&cvsroot=tuhopuu>
  1.10      +4 -1      tuhopuu3/source/blender/blenkernel/intern/object.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/blenkernel/intern/object.c.diff?r1=1.9&r2=1.10&cvsroot=tuhopuu>
  1.10      +3 -1      tuhopuu3/source/blender/blenkernel/intern/scene.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/blenkernel/intern/scene.c.diff?r1=1.9&r2=1.10&cvsroot=tuhopuu>
  1.12      +4 -2      tuhopuu3/source/blender/blenkernel/intern/text.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/blenkernel/intern/text.c.diff?r1=1.11&r2=1.12&cvsroot=tuhopuu>
  1.18      +13 -3     tuhopuu3/source/blender/blenloader/intern/readfile.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/blenloader/intern/readfile.c.diff?r1=1.17&r2=1.18&cvsroot=tuhopuu>
  1.14      +4 -1      tuhopuu3/source/blender/blenloader/intern/writefile.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/blenloader/intern/writefile.c.diff?r1=1.13&r2=1.14&cvsroot=tuhopuu>
  1.4       +1 -2      tuhopuu3/source/blender/include/BIF_drawtext.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/include/BIF_drawtext.h.diff?r1=1.3&r2=1.4&cvsroot=tuhopuu>
  1.18      +16 -15    tuhopuu3/source/blender/include/BIF_resources.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/include/BIF_resources.h.diff?r1=1.17&r2=1.18&cvsroot=tuhopuu>
  1.7       +5 -3      tuhopuu3/source/blender/include/BIF_transform.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/include/BIF_transform.h.diff?r1=1.6&r2=1.7&cvsroot=tuhopuu>
  1.14      +2 -1      tuhopuu3/source/blender/include/blendef.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/include/blendef.h.diff?r1=1.13&r2=1.14&cvsroot=tuhopuu>
  1.5       +8 -3      tuhopuu3/source/blender/makesdna/DNA_screen_types.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/makesdna/DNA_screen_types.h.diff?r1=1.4&r2=1.5&cvsroot=tuhopuu>
  1.7       +9 -5      tuhopuu3/source/blender/makesdna/DNA_space_types.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/makesdna/DNA_space_types.h.diff?r1=1.6&r2=1.7&cvsroot=tuhopuu>
  1.3       +3 -3      tuhopuu3/source/blender/makesdna/DNA_text_types.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/makesdna/DNA_text_types.h.diff?r1=1.2&r2=1.3&cvsroot=tuhopuu>
  1.11      +13 -1     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.10&r2=1.11&cvsroot=tuhopuu>
  1.4       +26 -3     tuhopuu3/source/blender/python/api2_2x/windowTheme.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/python/api2_2x/windowTheme.c.diff?r1=1.3&r2=1.4&cvsroot=tuhopuu>
  1.10      +8 -5      tuhopuu3/source/blender/renderconverter/intern/convertBlenderScene.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/renderconverter/intern/convertBlenderScene.c.diff?r1=1.9&r2=1.10&cvsroot=tuhopuu>
  1.30      +3 -2      tuhopuu3/source/blender/src/buttons_editing.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/buttons_editing.c.diff?r1=1.29&r2=1.30&cvsroot=tuhopuu>
  1.27      +9 -6      tuhopuu3/source/blender/src/buttons_object.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/buttons_object.c.diff?r1=1.26&r2=1.27&cvsroot=tuhopuu>
  1.24      +10 -8     tuhopuu3/source/blender/src/buttons_scene.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/buttons_scene.c.diff?r1=1.23&r2=1.24&cvsroot=tuhopuu>
  1.6       +86 -8     tuhopuu3/source/blender/src/buttons_script.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/buttons_script.c.diff?r1=1.5&r2=1.6&cvsroot=tuhopuu>
  1.8       +33 -13    tuhopuu3/source/blender/src/drawipo.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/drawipo.c.diff?r1=1.7&r2=1.8&cvsroot=tuhopuu>
  1.24      +8 -9      tuhopuu3/source/blender/src/drawtext.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/drawtext.c.diff?r1=1.23&r2=1.24&cvsroot=tuhopuu>
  1.21      +30 -101   tuhopuu3/source/blender/src/drawview.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/drawview.c.diff?r1=1.20&r2=1.21&cvsroot=tuhopuu>
  1.7       +2 -1      tuhopuu3/source/blender/src/editface.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/editface.c.diff?r1=1.6&r2=1.7&cvsroot=tuhopuu>
  1.14      +1 -1      tuhopuu3/source/blender/src/editipo.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/editipo.c.diff?r1=1.13&r2=1.14&cvsroot=tuhopuu>
  1.8       +3 -1      tuhopuu3/source/blender/src/editmball.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/editmball.c.diff?r1=1.7&r2=1.8&cvsroot=tuhopuu>
  1.5       +316 -212  tuhopuu3/source/blender/src/editmesh_tools.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/editmesh_tools.c.diff?r1=1.4&r2=1.5&cvsroot=tuhopuu>
  1.34      +33 -18    tuhopuu3/source/blender/src/editobject.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/editobject.c.diff?r1=1.33&r2=1.34&cvsroot=tuhopuu>
  1.13      +134 -7    tuhopuu3/source/blender/src/editscreen.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/editscreen.c.diff?r1=1.12&r2=1.13&cvsroot=tuhopuu>
  1.17      +13 -4     tuhopuu3/source/blender/src/editview.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/editview.c.diff?r1=1.16&r2=1.17&cvsroot=tuhopuu>
  1.6       +7 -44     tuhopuu3/source/blender/src/filesel.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/filesel.c.diff?r1=1.5&r2=1.6&cvsroot=tuhopuu>
  1.14      +5 -18     tuhopuu3/source/blender/src/header_text.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/header_text.c.diff?r1=1.13&r2=1.14&cvsroot=tuhopuu>
  1.25      +168 -41   tuhopuu3/source/blender/src/header_view3d.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/header_view3d.c.diff?r1=1.24&r2=1.25&cvsroot=tuhopuu>
  1.16      +27 -16    tuhopuu3/source/blender/src/headerbuttons.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/headerbuttons.c.diff?r1=1.15&r2=1.16&cvsroot=tuhopuu>
  1.26      +38 -5     tuhopuu3/source/blender/src/interface.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/interface.c.diff?r1=1.25&r2=1.26&cvsroot=tuhopuu>
  1.21      +14 -7     tuhopuu3/source/blender/src/resources.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/resources.c.diff?r1=1.20&r2=1.21&cvsroot=tuhopuu>
  1.53      +71 -36    tuhopuu3/source/blender/src/space.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/space.c.diff?r1=1.52&r2=1.53&cvsroot=tuhopuu>
  1.18      +12 -6     tuhopuu3/source/blender/src/toolbox.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/toolbox.c.diff?r1=1.17&r2=1.18&cvsroot=tuhopuu>
  1.29      +300 -261  tuhopuu3/source/blender/src/transform.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/transform.c.diff?r1=1.28&r2=1.29&cvsroot=tuhopuu>
  1.23      +54 -22    tuhopuu3/source/blender/src/transform_constraints.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/transform_constraints.c.diff?r1=1.22&r2=1.23&cvsroot=tuhopuu>
  1.7       +4 -1      tuhopuu3/source/blender/src/transform_conversions.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/transform_conversions.c.diff?r1=1.6&r2=1.7&cvsroot=tuhopuu>
  1.21      +11 -0     tuhopuu3/source/blender/src/transform_generics.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/transform_generics.c.diff?r1=1.20&r2=1.21&cvsroot=tuhopuu>
  1.17      +11 -9     tuhopuu3/source/blender/src/transform_manipulator.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/transform_manipulator.c.diff?r1=1.16&r2=1.17&cvsroot=tuhopuu>
  1.12      +15 -16    tuhopuu3/source/blender/src/usiblender.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/usiblender.c.diff?r1=1.11&r2=1.12&cvsroot=tuhopuu>
  1.7       +2 -1      tuhopuu3/source/blender/src/view.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/view.c.diff?r1=1.6&r2=1.7&cvsroot=tuhopuu>
  1.7       +13 -1     tuhopuu3/source/blender/src/vpaint.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/vpaint.c.diff?r1=1.6&r2=1.7&cvsroot=tuhopuu>