[Bf-blender-cvs] CVS commit: blender/source/blender/blenloader/intern readfile.c blender/source/blender/include BIF_drawoops.h BSE_drawoops.h blendef.h blender/source/blender/makesdna DNA_material_types.h blender/source/blender/python/api2_2x BezTriple.c Image.c Ipocurve.c Material.c Types.c ...

[Ton Roosendaal]

ton (Ton Roosendaal) 2005/12/17 21:25:42 CET

  Modified files:        (Branch: orange)
    blender/source/blender/blenloader/intern readfile.c 
    blender/source/blender/include BIF_drawoops.h BSE_drawoops.h 
                                   blendef.h 
    blender/source/blender/makesdna DNA_material_types.h 
    blender/source/blender/python/api2_2x BezTriple.c Image.c 
                                          Ipocurve.c Material.c 
                                          Types.c 
    blender/source/blender/python/api2_2x/doc Ipo.py Material.py 
    blender/source/blender/src buttons_shading.c drawoops.c 
                               editoops.c header_oops.c outliner.c 
                               space.c toets.c 
  
  Log:
  Saturday merger of bf-blender in orange branch.
  
  Revision  Changes    Path
  1.214.2.19 +5 -2      blender/source/blender/blenloader/intern/readfile.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/blenloader/intern/readfile.c.diff?r1=1.214.2.18&r2=1.214.2.19&cvsroot=bf-blender>
  1.5.2.1   +2 -2      blender/source/blender/include/BIF_drawoops.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/include/BIF_drawoops.h.diff?r1=1.5.2.0&r2=1.5.2.1&cvsroot=bf-blender>
  1.7.2.1   +2 -2      blender/source/blender/include/BSE_drawoops.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/include/BSE_drawoops.h.diff?r1=1.7.2.0&r2=1.7.2.1&cvsroot=bf-blender>
  1.48.2.2  +2 -1      blender/source/blender/include/blendef.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/include/blendef.h.diff?r1=1.48.2.1&r2=1.48.2.2&cvsroot=bf-blender>
  1.30.2.8  +3 -1      blender/source/blender/makesdna/DNA_material_types.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/makesdna/DNA_material_types.h.diff?r1=1.30.2.7&r2=1.30.2.8&cvsroot=bf-blender>
  1.16.2.2  +20 -8     blender/source/blender/python/api2_2x/BezTriple.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/python/api2_2x/BezTriple.c.diff?r1=1.16.2.1&r2=1.16.2.2&cvsroot=bf-blender>
  1.35.2.3  +5 -6      blender/source/blender/python/api2_2x/Image.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/python/api2_2x/Image.c.diff?r1=1.35.2.2&r2=1.35.2.3&cvsroot=bf-blender>
  1.31.2.3  +5 -3      blender/source/blender/python/api2_2x/Ipocurve.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/python/api2_2x/Ipocurve.c.diff?r1=1.31.2.2&r2=1.31.2.3&cvsroot=bf-blender>
  1.43.2.2  +13 -60    blender/source/blender/python/api2_2x/Material.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/python/api2_2x/Material.c.diff?r1=1.43.2.1&r2=1.43.2.2&cvsroot=bf-blender>
  1.28.2.1  +1 -2      blender/source/blender/python/api2_2x/Types.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/python/api2_2x/Types.c.diff?r1=1.28.2.0&r2=1.28.2.1&cvsroot=bf-blender>
  1.30.2.2  +6 -2      blender/source/blender/python/api2_2x/doc/Ipo.py
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/python/api2_2x/doc/Ipo.py.diff?r1=1.30.2.1&r2=1.30.2.2&cvsroot=bf-blender>
  1.16.2.1  +22 -14    blender/source/blender/python/api2_2x/doc/Material.py
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/python/api2_2x/doc/Material.py.diff?r1=1.16.2.0&r2=1.16.2.1&cvsroot=bf-blender>
  1.157.2.13 +6 -2      blender/source/blender/src/buttons_shading.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/src/buttons_shading.c.diff?r1=1.157.2.12&r2=1.157.2.13&cvsroot=bf-blender>
  1.24.2.1  +5 -5      blender/source/blender/src/drawoops.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/src/drawoops.c.diff?r1=1.24.2.0&r2=1.24.2.1&cvsroot=bf-blender>
  1.18.2.1  +12 -1     blender/source/blender/src/editoops.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/src/editoops.c.diff?r1=1.18.2.0&r2=1.18.2.1&cvsroot=bf-blender>
  1.22.2.2  +46 -23    blender/source/blender/src/header_oops.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/src/header_oops.c.diff?r1=1.22.2.1&r2=1.22.2.2&cvsroot=bf-blender>
  1.58.2.6  +70 -79    blender/source/blender/src/outliner.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/src/outliner.c.diff?r1=1.58.2.5&r2=1.58.2.6&cvsroot=bf-blender>
  1.317.2.7 +6 -1      blender/source/blender/src/space.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/src/space.c.diff?r1=1.317.2.6&r2=1.317.2.7&cvsroot=bf-blender>
  1.66.2.2  +3 -1      blender/source/blender/src/toets.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/src/toets.c.diff?r1=1.66.2.1&r2=1.66.2.2&cvsroot=bf-blender>