[tuhopuu-cvs] CVS commit: tuhopuu3/source/blender/blenkernel/intern displist.c tuhopuu3/source/blender/blenlib BLI_arithb.h tuhopuu3/source/blender/blenlib/intern arithb.c tuhopuu3/source/blender/include butspace.h tuhopuu3/source/blender/python/api2_2x Blender.c tuhopuu3/source/blender/render/intern/source rendercore.c ...

[Chris Want]

hos (Chris Want) 2005/01/15 19:12:22 CET

  Modified files:
    tuhopuu3/source/blender/blenkernel/intern displist.c 
    tuhopuu3/source/blender/blenlib BLI_arithb.h 
    tuhopuu3/source/blender/blenlib/intern arithb.c 
    tuhopuu3/source/blender/include butspace.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_object.c 
                                buttons_shading.c drawobject.c 
                                editobject.c header_view3d.c 
                                space.c toolbox.c 
  
  Log:
  Post merge conflict resolution.
  
  Revision  Changes    Path
  1.4       +2 -2      tuhopuu3/source/blender/blenkernel/intern/displist.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/blenkernel/intern/displist.c.diff?r1=1.3&r2=1.4&cvsroot=tuhopuu>
  1.4       +7 -0      tuhopuu3/source/blender/blenlib/BLI_arithb.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/blenlib/BLI_arithb.h.diff?r1=1.3&r2=1.4&cvsroot=tuhopuu>
  1.4       +14 -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.3&r2=1.4&cvsroot=tuhopuu>
  1.4       +14 -1     tuhopuu3/source/blender/include/butspace.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/include/butspace.h.diff?r1=1.3&r2=1.4&cvsroot=tuhopuu>
  1.3       +20 -23    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.2&r2=1.3&cvsroot=tuhopuu>
  1.4       +2 -2      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.3&r2=1.4&cvsroot=tuhopuu>
  1.5       +124 -42   tuhopuu3/source/blender/src/buttons_editing.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/buttons_editing.c.diff?r1=1.4&r2=1.5&cvsroot=tuhopuu>
  1.4       +41 -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.3&r2=1.4&cvsroot=tuhopuu>
  1.4       +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.3&r2=1.4&cvsroot=tuhopuu>
  1.8       +140 -10   tuhopuu3/source/blender/src/drawobject.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/drawobject.c.diff?r1=1.7&r2=1.8&cvsroot=tuhopuu>
  1.5       +12 -3     tuhopuu3/source/blender/src/editobject.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/editobject.c.diff?r1=1.4&r2=1.5&cvsroot=tuhopuu>
  1.5       +13 -2     tuhopuu3/source/blender/src/header_view3d.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/header_view3d.c.diff?r1=1.4&r2=1.5&cvsroot=tuhopuu>
  1.17      +13 -2     tuhopuu3/source/blender/src/space.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/space.c.diff?r1=1.16&r2=1.17&cvsroot=tuhopuu>
  1.3       +2 -1      tuhopuu3/source/blender/src/toolbox.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/toolbox.c.diff?r1=1.2&r2=1.3&cvsroot=tuhopuu>