[tuhopuu-cvs] CVS commit: tuhopuu3/doc merge-howto-tuhopuu3.txt tuhopuu3/make/xc_blender/xc_blender.xcode project.pbxproj tuhopuu3/source Makefile tuhopuu3/source/blender/blenkernel/intern blender.c displist.c object.c text.c tuhopuu3/source/blender/include butspace.h ...

[Chris Want]

hos (Chris Want) 2005/05/23 01:52:37 CEST

  Modified files:
    tuhopuu3/doc         merge-howto-tuhopuu3.txt 
    tuhopuu3/make/xc_blender/xc_blender.xcode project.pbxproj 
    tuhopuu3/source      Makefile 
    tuhopuu3/source/blender/blenkernel/intern blender.c displist.c 
                                              object.c text.c 
    tuhopuu3/source/blender/include butspace.h 
    tuhopuu3/source/blender/makesdna DNA_material_types.h 
                                     DNA_scene_types.h 
                                     DNA_space_types.h 
    tuhopuu3/source/blender/python/api2_2x Blender.c 
    tuhopuu3/source/blender/render/intern/source rendercore.c 
    tuhopuu3/source/blender/renderconverter/intern 
                                                   convertBlenderScene.c 
    tuhopuu3/source/blender/src buttons_object.c buttons_scene.c 
                                buttons_shading.c drawobject.c 
                                drawtext.c drawview.c 
                                editmesh_tools.c editscreen.c 
                                editseq.c header_view3d.c 
                                headerbuttons.c toets.c 
                                transform.c 
                                transform_constraints.c 
                                transform_manipulator.c vpaint.c 
  
  Log:
  Post-merge conflict resolution
  
  Revision  Changes    Path
  1.21      +5 -2      tuhopuu3/doc/merge-howto-tuhopuu3.txt
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/doc/merge-howto-tuhopuu3.txt.diff?r1=1.20&r2=1.21&cvsroot=tuhopuu>
  1.7       +3 -2      tuhopuu3/make/xc_blender/xc_blender.xcode/project.pbxproj
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/make/xc_blender/xc_blender.xcode/project.pbxproj.diff?r1=1.6&r2=1.7&cvsroot=tuhopuu>
  1.6       +14 -1     tuhopuu3/source/Makefile
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/Makefile.diff?r1=1.5&r2=1.6&cvsroot=tuhopuu>
  1.5       +47 -0     tuhopuu3/source/blender/blenkernel/intern/blender.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/blenkernel/intern/blender.c.diff?r1=1.4&r2=1.5&cvsroot=tuhopuu>
  1.20      +4 -1      tuhopuu3/source/blender/blenkernel/intern/displist.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/blenkernel/intern/displist.c.diff?r1=1.19&r2=1.20&cvsroot=tuhopuu>
  1.11      +5 -6      tuhopuu3/source/blender/blenkernel/intern/object.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/blenkernel/intern/object.c.diff?r1=1.10&r2=1.11&cvsroot=tuhopuu>
  1.13      +4 -5      tuhopuu3/source/blender/blenkernel/intern/text.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/blenkernel/intern/text.c.diff?r1=1.12&r2=1.13&cvsroot=tuhopuu>
  1.14      +2 -0      tuhopuu3/source/blender/include/butspace.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/include/butspace.h.diff?r1=1.13&r2=1.14&cvsroot=tuhopuu>
  1.8       +10 -3     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.7&r2=1.8&cvsroot=tuhopuu>
  1.13      +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.12&r2=1.13&cvsroot=tuhopuu>
  1.8       +1 -0      tuhopuu3/source/blender/makesdna/DNA_space_types.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/makesdna/DNA_space_types.h.diff?r1=1.7&r2=1.8&cvsroot=tuhopuu>
  1.12      +4 -0      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.11&r2=1.12&cvsroot=tuhopuu>
  1.13      +1 -1      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.12&r2=1.13&cvsroot=tuhopuu>
  1.11      +14 -8     tuhopuu3/source/blender/renderconverter/intern/convertBlenderScene.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/renderconverter/intern/convertBlenderScene.c.diff?r1=1.10&r2=1.11&cvsroot=tuhopuu>
  1.28      +10 -10    tuhopuu3/source/blender/src/buttons_object.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/buttons_object.c.diff?r1=1.27&r2=1.28&cvsroot=tuhopuu>
  1.25      +32 -23    tuhopuu3/source/blender/src/buttons_scene.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/buttons_scene.c.diff?r1=1.24&r2=1.25&cvsroot=tuhopuu>
  1.29      +115 -6    tuhopuu3/source/blender/src/buttons_shading.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/buttons_shading.c.diff?r1=1.28&r2=1.29&cvsroot=tuhopuu>
  1.31      +2 -2      tuhopuu3/source/blender/src/drawobject.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/drawobject.c.diff?r1=1.30&r2=1.31&cvsroot=tuhopuu>
  1.25      +6 -4      tuhopuu3/source/blender/src/drawtext.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/drawtext.c.diff?r1=1.24&r2=1.25&cvsroot=tuhopuu>
  1.22      +8 -6      tuhopuu3/source/blender/src/drawview.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/drawview.c.diff?r1=1.21&r2=1.22&cvsroot=tuhopuu>
  1.6       +3 -0      tuhopuu3/source/blender/src/editmesh_tools.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/editmesh_tools.c.diff?r1=1.5&r2=1.6&cvsroot=tuhopuu>
  1.15      +39 -7     tuhopuu3/source/blender/src/editscreen.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/editscreen.c.diff?r1=1.14&r2=1.15&cvsroot=tuhopuu>
  1.8       +32 -4     tuhopuu3/source/blender/src/editseq.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/editseq.c.diff?r1=1.7&r2=1.8&cvsroot=tuhopuu>
  1.27      +5 -5      tuhopuu3/source/blender/src/header_view3d.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/header_view3d.c.diff?r1=1.26&r2=1.27&cvsroot=tuhopuu>
  1.17      +3 -3      tuhopuu3/source/blender/src/headerbuttons.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/headerbuttons.c.diff?r1=1.16&r2=1.17&cvsroot=tuhopuu>
  1.8       +8 -1      tuhopuu3/source/blender/src/toets.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/toets.c.diff?r1=1.7&r2=1.8&cvsroot=tuhopuu>
  1.30      +9 -5      tuhopuu3/source/blender/src/transform.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/transform.c.diff?r1=1.29&r2=1.30&cvsroot=tuhopuu>
  1.24      +18 -15    tuhopuu3/source/blender/src/transform_constraints.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/transform_constraints.c.diff?r1=1.23&r2=1.24&cvsroot=tuhopuu>
  1.18      +8 -1      tuhopuu3/source/blender/src/transform_manipulator.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/transform_manipulator.c.diff?r1=1.17&r2=1.18&cvsroot=tuhopuu>
  1.8       +22 -15    tuhopuu3/source/blender/src/vpaint.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/vpaint.c.diff?r1=1.7&r2=1.8&cvsroot=tuhopuu>