[tuhopuu-cvs] CVS commit: tuhopuu3/release/datafiles blenderbuttons tuhopuu3/source/blender/blenloader/intern readfile.c writefile.c tuhopuu3/source/blender/img/intern IMG_CanvasRGBA32.cpp tuhopuu3/source/blender/include BIF_resources.h butspace.h tuhopuu3/source/blender/python/api2_2x Blender.c ...

[Chris Want]

hos (Chris Want) 2005/09/11 20:47:31 CEST

  Modified files:
    tuhopuu3/release/datafiles blenderbuttons 
    tuhopuu3/source/blender/blenloader/intern readfile.c 
                                              writefile.c 
    tuhopuu3/source/blender/img/intern IMG_CanvasRGBA32.cpp 
    tuhopuu3/source/blender/include BIF_resources.h butspace.h 
    tuhopuu3/source/blender/python/api2_2x Blender.c NMesh.c 
    tuhopuu3/source/blender/src blenderbuttons.c buttons_editing.c 
                                buttons_object.c drawimage.c 
                                drawview.c editarmature.c 
                                editdeform.c editmesh_tools.c 
                                editobject.c outliner.c space.c 
                                vpaint.c 
  
  Log:
  Post-merge conflict resolution
  
  Comments:
  
  * Took blenderbuttons from bf -- beware!
  * Painting tools caused conflicts, took tuho versions mostly
  
  Revision  Changes    Path
  1.8       +230 -152  tuhopuu3/release/datafiles/blenderbuttons
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/release/datafiles/blenderbuttons.diff?r1=1.7&r2=1.8&cvsroot=tuhopuu>
  1.41      +13 -0     tuhopuu3/source/blender/blenloader/intern/readfile.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/blenloader/intern/readfile.c.diff?r1=1.40&r2=1.41&cvsroot=tuhopuu>
  1.27      +3 -0      tuhopuu3/source/blender/blenloader/intern/writefile.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/blenloader/intern/writefile.c.diff?r1=1.26&r2=1.27&cvsroot=tuhopuu>
  1.4       +6 -6      tuhopuu3/source/blender/img/intern/IMG_CanvasRGBA32.cpp
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/img/intern/IMG_CanvasRGBA32.cpp.diff?r1=1.3&r2=1.4&cvsroot=tuhopuu>
  1.24      +10 -10    tuhopuu3/source/blender/include/BIF_resources.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/include/BIF_resources.h.diff?r1=1.23&r2=1.24&cvsroot=tuhopuu>
  1.27      +1 -0      tuhopuu3/source/blender/include/butspace.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/include/butspace.h.diff?r1=1.26&r2=1.27&cvsroot=tuhopuu>
  1.17      +3 -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.16&r2=1.17&cvsroot=tuhopuu>
  1.12      +23 -3     tuhopuu3/source/blender/python/api2_2x/NMesh.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/python/api2_2x/NMesh.c.diff?r1=1.11&r2=1.12&cvsroot=tuhopuu>
  1.11      +1453 -1394tuhopuu3/source/blender/src/blenderbuttons.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/blenderbuttons.c.diff?r1=1.10&r2=1.11&cvsroot=tuhopuu>
  1.59      +8 -15     tuhopuu3/source/blender/src/buttons_editing.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/buttons_editing.c.diff?r1=1.58&r2=1.59&cvsroot=tuhopuu>
  1.44      +54 -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.43&r2=1.44&cvsroot=tuhopuu>
  1.20      +31 -0     tuhopuu3/source/blender/src/drawimage.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/drawimage.c.diff?r1=1.19&r2=1.20&cvsroot=tuhopuu>
  1.40      +1 -1      tuhopuu3/source/blender/src/drawview.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/drawview.c.diff?r1=1.39&r2=1.40&cvsroot=tuhopuu>
  1.16      +66 -62    tuhopuu3/source/blender/src/editarmature.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/editarmature.c.diff?r1=1.15&r2=1.16&cvsroot=tuhopuu>
  1.10      +1 -1      tuhopuu3/source/blender/src/editdeform.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/editdeform.c.diff?r1=1.9&r2=1.10&cvsroot=tuhopuu>
  1.21      +40 -22    tuhopuu3/source/blender/src/editmesh_tools.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/editmesh_tools.c.diff?r1=1.20&r2=1.21&cvsroot=tuhopuu>
  1.53      +43 -26    tuhopuu3/source/blender/src/editobject.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/editobject.c.diff?r1=1.52&r2=1.53&cvsroot=tuhopuu>
  1.22      +41 -12    tuhopuu3/source/blender/src/outliner.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/outliner.c.diff?r1=1.21&r2=1.22&cvsroot=tuhopuu>
  1.71      +2 -1      tuhopuu3/source/blender/src/space.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/space.c.diff?r1=1.70&r2=1.71&cvsroot=tuhopuu>
  1.18      +8 -3      tuhopuu3/source/blender/src/vpaint.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/vpaint.c.diff?r1=1.17&r2=1.18&cvsroot=tuhopuu>