[tuhopuu-cvs] CVS commit: tuhopuu3/doc merge-howto-tuhopuu3.txt tuhopuu3/source/blender/blenkernel BKE_displist.h tuhopuu3/source/blender/blenkernel/intern displist.c scene.c tuhopuu3/source/blender/blenloader/intern readfile.c tuhopuu3/source/blender/makesdna DNA_material_types.h DNA_scene_types.h ...

[Chris Want]

hos (Chris Want) 2005/05/29 21:34:42 CEST

  Modified files:
    tuhopuu3/doc         merge-howto-tuhopuu3.txt 
    tuhopuu3/source/blender/blenkernel BKE_displist.h 
    tuhopuu3/source/blender/blenkernel/intern displist.c scene.c 
    tuhopuu3/source/blender/blenloader/intern readfile.c 
    tuhopuu3/source/blender/makesdna DNA_material_types.h 
                                     DNA_scene_types.h 
    tuhopuu3/source/blender/renderconverter/intern 
                                                   convertBlenderScene.c 
    tuhopuu3/source/blender/src buttons_object.c buttons_scene.c 
                                buttons_shading.c drawobject.c 
                                editfont.c editmesh_mods.c 
                                editscreen.c header_info.c 
                                header_view3d.c headerbuttons.c 
                                interface.c interface_draw.c 
                                outliner.c toets.c transform.c 
                                transform_constraints.c 
                                transform_conversions.c 
                                transform_manipulator.c 
  
  Log:
  Post-merge conflict resolution
  
  Revision  Changes    Path
  1.22      +4 -4      tuhopuu3/doc/merge-howto-tuhopuu3.txt
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/doc/merge-howto-tuhopuu3.txt.diff?r1=1.21&r2=1.22&cvsroot=tuhopuu>
  1.5       +1 -0      tuhopuu3/source/blender/blenkernel/BKE_displist.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/blenkernel/BKE_displist.h.diff?r1=1.4&r2=1.5&cvsroot=tuhopuu>
  1.21      +1 -12     tuhopuu3/source/blender/blenkernel/intern/displist.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/blenkernel/intern/displist.c.diff?r1=1.20&r2=1.21&cvsroot=tuhopuu>
  1.11      +1 -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.10&r2=1.11&cvsroot=tuhopuu>
  1.19      +22 -20    tuhopuu3/source/blender/blenloader/intern/readfile.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/blenloader/intern/readfile.c.diff?r1=1.18&r2=1.19&cvsroot=tuhopuu>
  1.9       +3 -6      tuhopuu3/source/blender/makesdna/DNA_material_types.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/makesdna/DNA_material_types.h.diff?r1=1.8&r2=1.9&cvsroot=tuhopuu>
  1.14      +1 -1      tuhopuu3/source/blender/makesdna/DNA_scene_types.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/makesdna/DNA_scene_types.h.diff?r1=1.13&r2=1.14&cvsroot=tuhopuu>
  1.12      +3 -2      tuhopuu3/source/blender/renderconverter/intern/convertBlenderScene.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/renderconverter/intern/convertBlenderScene.c.diff?r1=1.11&r2=1.12&cvsroot=tuhopuu>
  1.29      +29 -68    tuhopuu3/source/blender/src/buttons_object.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/buttons_object.c.diff?r1=1.28&r2=1.29&cvsroot=tuhopuu>
  1.27      +12 -9     tuhopuu3/source/blender/src/buttons_scene.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/buttons_scene.c.diff?r1=1.26&r2=1.27&cvsroot=tuhopuu>
  1.30      +26 -21    tuhopuu3/source/blender/src/buttons_shading.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/buttons_shading.c.diff?r1=1.29&r2=1.30&cvsroot=tuhopuu>
  1.32      +2 -0      tuhopuu3/source/blender/src/drawobject.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/drawobject.c.diff?r1=1.31&r2=1.32&cvsroot=tuhopuu>
  1.5       +24 -9     tuhopuu3/source/blender/src/editfont.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/editfont.c.diff?r1=1.4&r2=1.5&cvsroot=tuhopuu>
  1.8       +50 -3     tuhopuu3/source/blender/src/editmesh_mods.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/editmesh_mods.c.diff?r1=1.7&r2=1.8&cvsroot=tuhopuu>
  1.16      +1 -4      tuhopuu3/source/blender/src/editscreen.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/editscreen.c.diff?r1=1.15&r2=1.16&cvsroot=tuhopuu>
  1.11      +2 -0      tuhopuu3/source/blender/src/header_info.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/header_info.c.diff?r1=1.10&r2=1.11&cvsroot=tuhopuu>
  1.28      +9 -18     tuhopuu3/source/blender/src/header_view3d.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/header_view3d.c.diff?r1=1.27&r2=1.28&cvsroot=tuhopuu>
  1.18      +0 -5      tuhopuu3/source/blender/src/headerbuttons.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/headerbuttons.c.diff?r1=1.17&r2=1.18&cvsroot=tuhopuu>
  1.27      +3 -1      tuhopuu3/source/blender/src/interface.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/interface.c.diff?r1=1.26&r2=1.27&cvsroot=tuhopuu>
  1.19      +17 -1     tuhopuu3/source/blender/src/interface_draw.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/interface_draw.c.diff?r1=1.18&r2=1.19&cvsroot=tuhopuu>
  1.7       +1 -0      tuhopuu3/source/blender/src/outliner.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/outliner.c.diff?r1=1.6&r2=1.7&cvsroot=tuhopuu>
  1.9       +1 -1      tuhopuu3/source/blender/src/toets.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/toets.c.diff?r1=1.8&r2=1.9&cvsroot=tuhopuu>
  1.31      +15 -6     tuhopuu3/source/blender/src/transform.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/transform.c.diff?r1=1.30&r2=1.31&cvsroot=tuhopuu>
  1.25      +15 -0     tuhopuu3/source/blender/src/transform_constraints.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/transform_constraints.c.diff?r1=1.24&r2=1.25&cvsroot=tuhopuu>
  1.8       +0 -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.7&r2=1.8&cvsroot=tuhopuu>
  1.19      +5 -4      tuhopuu3/source/blender/src/transform_manipulator.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/transform_manipulator.c.diff?r1=1.18&r2=1.19&cvsroot=tuhopuu>