[tuhopuu-cvs] CVS commit: tuhopuu3/doc merge-howto-tuhopuu3.txt tuhopuu3/intern/bmfont/intern BMF_BitmapFont.cpp tuhopuu3/release/datafiles blenderbuttons tuhopuu3/release/scripts mod_ai2obj.py mod_blender.py mod_eps2obj.py mod_gimp2obj.py mod_meshtools.py mod_svg2obj.py ...

Sun Mar 27 23:23:02 CEST 2005

hos (Chris Want) 2005/03/27 23:23:02 CEST

  Modified files:
    tuhopuu3/doc         merge-howto-tuhopuu3.txt 
    tuhopuu3/intern/bmfont/intern BMF_BitmapFont.cpp 
    tuhopuu3/release/datafiles blenderbuttons 
    tuhopuu3/source      nan_compile.mk 
    tuhopuu3/source/blender/blenkernel/intern displist.c 
    tuhopuu3/source/blender/blenlib/intern arithb.c 
    tuhopuu3/source/blender/include BIF_resources.h blendef.h 
    tuhopuu3/source/blender/makesdna DNA_userdef_types.h 
    tuhopuu3/source/blender/python BPY_menus.c BPY_menus.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 drawobject.c 
                                drawview.c editipo.c editobject.c 
                                editscreen.c editseq.c editview.c 
                                header_info.c header_seq.c 
                                header_sound.c header_text.c 
                                header_view3d.c headerbuttons.c 
                                interface.c resources.c space.c 
                                toets.c transform.c transform.h 
                                transform_constraints.c 
                                transform_constraints.h 
                                transform_generics.c 
                                transform_manipulator.c 
                                usiblender.c 
  Removed files:
    tuhopuu3/release/scripts mod_ai2obj.py mod_blender.py 
                             mod_eps2obj.py mod_gimp2obj.py 
                             mod_meshtools.py mod_svg2obj.py 
  
  Log:
  Post-merge conflict resolution
  
  Revision  Changes    Path
  1.12      +4 -6      tuhopuu3/doc/merge-howto-tuhopuu3.txt
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/doc/merge-howto-tuhopuu3.txt.diff?r1=1.11&r2=1.12&cvsroot=tuhopuu>
  1.4       +25 -3     tuhopuu3/intern/bmfont/intern/BMF_BitmapFont.cpp
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/intern/bmfont/intern/BMF_BitmapFont.cpp.diff?r1=1.3&r2=1.4&cvsroot=tuhopuu>
  1.4       +0 -159    tuhopuu3/release/datafiles/blenderbuttons
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/release/datafiles/blenderbuttons.diff?r1=1.3&r2=1.4&cvsroot=tuhopuu>
  1.4       +6 -1      tuhopuu3/source/nan_compile.mk
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/nan_compile.mk.diff?r1=1.3&r2=1.4&cvsroot=tuhopuu>
  1.7       +14 -6     tuhopuu3/source/blender/blenkernel/intern/displist.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/blenkernel/intern/displist.c.diff?r1=1.6&r2=1.7&cvsroot=tuhopuu>
  1.9       +3 -1      tuhopuu3/source/blender/blenlib/intern/arithb.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/blenlib/intern/arithb.c.diff?r1=1.8&r2=1.9&cvsroot=tuhopuu>
  1.9       +24 -2     tuhopuu3/source/blender/include/BIF_resources.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/include/BIF_resources.h.diff?r1=1.8&r2=1.9&cvsroot=tuhopuu>
  1.8       +4 -1      tuhopuu3/source/blender/include/blendef.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/include/blendef.h.diff?r1=1.7&r2=1.8&cvsroot=tuhopuu>
  1.7       +5 -1      tuhopuu3/source/blender/makesdna/DNA_userdef_types.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/makesdna/DNA_userdef_types.h.diff?r1=1.6&r2=1.7&cvsroot=tuhopuu>
  1.6       +137 -63   tuhopuu3/source/blender/python/BPY_menus.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/python/BPY_menus.c.diff?r1=1.5&r2=1.6&cvsroot=tuhopuu>
  1.4       +2 -2      tuhopuu3/source/blender/python/BPY_menus.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/python/BPY_menus.h.diff?r1=1.3&r2=1.4&cvsroot=tuhopuu>
  1.9       +11 -8     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.8&r2=1.9&cvsroot=tuhopuu>
  1.10      +6 -6      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.9&r2=1.10&cvsroot=tuhopuu>
  1.17      +4 -1      tuhopuu3/source/blender/src/buttons_editing.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/buttons_editing.c.diff?r1=1.16&r2=1.17&cvsroot=tuhopuu>
  1.6       +3 -2      tuhopuu3/source/blender/src/buttons_logic.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/buttons_logic.c.diff?r1=1.5&r2=1.6&cvsroot=tuhopuu>
  1.10      +2 -2      tuhopuu3/source/blender/src/buttons_object.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/buttons_object.c.diff?r1=1.9&r2=1.10&cvsroot=tuhopuu>
  1.13      +4 -45     tuhopuu3/source/blender/src/buttons_scene.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/buttons_scene.c.diff?r1=1.12&r2=1.13&cvsroot=tuhopuu>
  1.20      +1 -1      tuhopuu3/source/blender/src/buttons_shading.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/buttons_shading.c.diff?r1=1.19&r2=1.20&cvsroot=tuhopuu>
  1.17      +824 -1769 tuhopuu3/source/blender/src/drawobject.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/drawobject.c.diff?r1=1.16&r2=1.17&cvsroot=tuhopuu>
  1.15      +10 -11    tuhopuu3/source/blender/src/drawview.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/drawview.c.diff?r1=1.14&r2=1.15&cvsroot=tuhopuu>
  1.8       +4 -4      tuhopuu3/source/blender/src/editipo.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/editipo.c.diff?r1=1.7&r2=1.8&cvsroot=tuhopuu>
  1.16      +7 -7      tuhopuu3/source/blender/src/editobject.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/editobject.c.diff?r1=1.15&r2=1.16&cvsroot=tuhopuu>
  1.10      +5 -3      tuhopuu3/source/blender/src/editscreen.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/editscreen.c.diff?r1=1.9&r2=1.10&cvsroot=tuhopuu>
  1.6       +21 -21    tuhopuu3/source/blender/src/editseq.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/editseq.c.diff?r1=1.5&r2=1.6&cvsroot=tuhopuu>
  1.9       +0 -4      tuhopuu3/source/blender/src/editview.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/editview.c.diff?r1=1.8&r2=1.9&cvsroot=tuhopuu>
  1.5       +2 -1      tuhopuu3/source/blender/src/header_info.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/header_info.c.diff?r1=1.4&r2=1.5&cvsroot=tuhopuu>
  1.4       +0 -3      tuhopuu3/source/blender/src/header_seq.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/header_seq.c.diff?r1=1.3&r2=1.4&cvsroot=tuhopuu>
  1.11      +1 -4      tuhopuu3/source/blender/src/header_sound.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/header_sound.c.diff?r1=1.10&r2=1.11&cvsroot=tuhopuu>
  1.6       +1 -4      tuhopuu3/source/blender/src/header_text.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/header_text.c.diff?r1=1.5&r2=1.6&cvsroot=tuhopuu>
  1.15      +30 -7     tuhopuu3/source/blender/src/header_view3d.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/header_view3d.c.diff?r1=1.14&r2=1.15&cvsroot=tuhopuu>
  1.11      +2 -1      tuhopuu3/source/blender/src/headerbuttons.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/headerbuttons.c.diff?r1=1.10&r2=1.11&cvsroot=tuhopuu>
  1.18      +34 -10    tuhopuu3/source/blender/src/interface.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/interface.c.diff?r1=1.17&r2=1.18&cvsroot=tuhopuu>
  1.12      +24 -4     tuhopuu3/source/blender/src/resources.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/resources.c.diff?r1=1.11&r2=1.12&cvsroot=tuhopuu>
  1.36      +54 -87    tuhopuu3/source/blender/src/space.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/space.c.diff?r1=1.35&r2=1.36&cvsroot=tuhopuu>
  1.5       +4 -2      tuhopuu3/source/blender/src/toets.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/toets.c.diff?r1=1.4&r2=1.5&cvsroot=tuhopuu>
  1.19      +183 -103  tuhopuu3/source/blender/src/transform.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/transform.c.diff?r1=1.18&r2=1.19&cvsroot=tuhopuu>
  1.14      +13 -1     tuhopuu3/source/blender/src/transform.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/transform.h.diff?r1=1.13&r2=1.14&cvsroot=tuhopuu>
  1.16      +93 -78    tuhopuu3/source/blender/src/transform_constraints.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/transform_constraints.c.diff?r1=1.15&r2=1.16&cvsroot=tuhopuu>
  1.10      +2 -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.9&r2=1.10&cvsroot=tuhopuu>
  1.13      +14 -5     tuhopuu3/source/blender/src/transform_generics.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/transform_generics.c.diff?r1=1.12&r2=1.13&cvsroot=tuhopuu>
  1.3       +917 -270  tuhopuu3/source/blender/src/transform_manipulator.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/transform_manipulator.c.diff?r1=1.2&r2=1.3&cvsroot=tuhopuu>
  1.6       +11 -2     tuhopuu3/source/blender/src/usiblender.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/usiblender.c.diff?r1=1.5&r2=1.6&cvsroot=tuhopuu>