[tuhopuu-cvs] CVS commit: tuhopuu3/doc merge-howto-tuhopuu3.txt building_blender.html building_blender.xml tuhopuu3/make/xc_blender/xc_blender.xcode project.pbxproj tuhopuu3/projectfiles/blender/blenkernel BKE_blenkernel.dsp tuhopuu3/source/blender/blenkernel BKE_global.h tuhopuu3/source/blender/blenkernel/intern displist.c ...

Sun May 8 03:49:02 CEST 2005

hos (Chris Want) 2005/05/08 03:49:02 CEST

  Modified files:
    tuhopuu3/doc         merge-howto-tuhopuu3.txt 
    tuhopuu3/make/xc_blender/xc_blender.xcode project.pbxproj 
    tuhopuu3/projectfiles/blender/blenkernel BKE_blenkernel.dsp 
    tuhopuu3/source/blender/blenkernel BKE_global.h 
    tuhopuu3/source/blender/blenkernel/intern displist.c ipo.c 
                                              object.c scene.c 
    tuhopuu3/source/blender/blenloader/intern readfile.c 
                                              writefile.c 
    tuhopuu3/source/blender/include BIF_resources.h 
                                    BIF_transform.h blendef.h 
                                    butspace.h 
    tuhopuu3/source/blender/makesdna DNA_object_types.h 
                                     DNA_scene_types.h 
                                     DNA_screen_types.h 
                                     DNA_space_types.h 
                                     DNA_userdef_types.h 
    tuhopuu3/source/blender/makesdna/intern makesdna.c 
    tuhopuu3/source/blender/renderconverter/intern 
                                                   convertBlenderScene.c 
    tuhopuu3/source/blender/src SConscript buttons_editing.c 
                                buttons_object.c buttons_scene.c 
                                drawimage.c drawipo.c drawobject.c 
                                drawview.c edit.c editaction.c 
                                editipo.c editmesh_mods.c 
                                editmesh_tools.c editobject.c 
                                editscreen.c editsima.c 
                                header_image.c header_info.c 
                                header_view3d.c headerbuttons.c 
                                interface.c resources.c space.c 
                                toolbox.c transform.c 
                                transform_constraints.c 
                                transform_conversions.c 
                                transform_generics.c 
                                transform_manipulator.c 
                                usiblender.c view.c vpaint.c 
    tuhopuu3/tools/scons/bs bs_libs.py 
  Removed files:
    tuhopuu3/doc         building_blender.html 
                         building_blender.xml 
  
  Log:
  Post-merge conflict resolution
  
  Revision  Changes    Path
  1.19      +4 -4      tuhopuu3/doc/merge-howto-tuhopuu3.txt
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/doc/merge-howto-tuhopuu3.txt.diff?r1=1.18&r2=1.19&cvsroot=tuhopuu>
  1.6       +116 -600  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.5&r2=1.6&cvsroot=tuhopuu>
  1.5       +4 -0      tuhopuu3/projectfiles/blender/blenkernel/BKE_blenkernel.dsp
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/projectfiles/blender/blenkernel/BKE_blenkernel.dsp.diff?r1=1.4&r2=1.5&cvsroot=tuhopuu>
  1.10      +6 -6      tuhopuu3/source/blender/blenkernel/BKE_global.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/blenkernel/BKE_global.h.diff?r1=1.9&r2=1.10&cvsroot=tuhopuu>
  1.19      +1 -0      tuhopuu3/source/blender/blenkernel/intern/displist.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/blenkernel/intern/displist.c.diff?r1=1.18&r2=1.19&cvsroot=tuhopuu>
  1.5       +4 -1      tuhopuu3/source/blender/blenkernel/intern/ipo.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/blenkernel/intern/ipo.c.diff?r1=1.4&r2=1.5&cvsroot=tuhopuu>
  1.9       +1 -0      tuhopuu3/source/blender/blenkernel/intern/object.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/blenkernel/intern/object.c.diff?r1=1.8&r2=1.9&cvsroot=tuhopuu>
  1.9       +3 -2      tuhopuu3/source/blender/blenkernel/intern/scene.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/blenkernel/intern/scene.c.diff?r1=1.8&r2=1.9&cvsroot=tuhopuu>
  1.16      +65 -59    tuhopuu3/source/blender/blenloader/intern/readfile.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/blenloader/intern/readfile.c.diff?r1=1.15&r2=1.16&cvsroot=tuhopuu>
  1.12      +41 -27    tuhopuu3/source/blender/blenloader/intern/writefile.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/blenloader/intern/writefile.c.diff?r1=1.11&r2=1.12&cvsroot=tuhopuu>
  1.15      +25 -22    tuhopuu3/source/blender/include/BIF_resources.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/include/BIF_resources.h.diff?r1=1.14&r2=1.15&cvsroot=tuhopuu>
  1.6       +5 -8      tuhopuu3/source/blender/include/BIF_transform.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/include/BIF_transform.h.diff?r1=1.5&r2=1.6&cvsroot=tuhopuu>
  1.12      +16 -5     tuhopuu3/source/blender/include/blendef.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/include/blendef.h.diff?r1=1.11&r2=1.12&cvsroot=tuhopuu>
  1.13      +5 -3      tuhopuu3/source/blender/include/butspace.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/include/butspace.h.diff?r1=1.12&r2=1.13&cvsroot=tuhopuu>
  1.8       +6 -83     tuhopuu3/source/blender/makesdna/DNA_object_types.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/makesdna/DNA_object_types.h.diff?r1=1.7&r2=1.8&cvsroot=tuhopuu>
  1.12      +14 -2     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.11&r2=1.12&cvsroot=tuhopuu>
  1.3       +4 -2      tuhopuu3/source/blender/makesdna/DNA_screen_types.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/makesdna/DNA_screen_types.h.diff?r1=1.2&r2=1.3&cvsroot=tuhopuu>
  1.6       +20 -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.5&r2=1.6&cvsroot=tuhopuu>
  1.14      +2 -1      tuhopuu3/source/blender/makesdna/DNA_userdef_types.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/makesdna/DNA_userdef_types.h.diff?r1=1.13&r2=1.14&cvsroot=tuhopuu>
  1.4       +2 -0      tuhopuu3/source/blender/makesdna/intern/makesdna.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/makesdna/intern/makesdna.c.diff?r1=1.3&r2=1.4&cvsroot=tuhopuu>
  1.9       +9 -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.8&r2=1.9&cvsroot=tuhopuu>
  1.11      +3 -0      tuhopuu3/source/blender/src/SConscript
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/SConscript.diff?r1=1.10&r2=1.11&cvsroot=tuhopuu>
  1.28      +23 -2     tuhopuu3/source/blender/src/buttons_editing.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/buttons_editing.c.diff?r1=1.27&r2=1.28&cvsroot=tuhopuu>
  1.25      +326 -41   tuhopuu3/source/blender/src/buttons_object.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/buttons_object.c.diff?r1=1.24&r2=1.25&cvsroot=tuhopuu>
  1.23      +2 -2      tuhopuu3/source/blender/src/buttons_scene.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/buttons_scene.c.diff?r1=1.22&r2=1.23&cvsroot=tuhopuu>
  1.11      +24 -7     tuhopuu3/source/blender/src/drawimage.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/drawimage.c.diff?r1=1.10&r2=1.11&cvsroot=tuhopuu>
  1.7       +60 -11    tuhopuu3/source/blender/src/drawipo.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/drawipo.c.diff?r1=1.6&r2=1.7&cvsroot=tuhopuu>
  1.29      +7 -8      tuhopuu3/source/blender/src/drawobject.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/drawobject.c.diff?r1=1.28&r2=1.29&cvsroot=tuhopuu>
  1.20      +4 -4      tuhopuu3/source/blender/src/drawview.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/drawview.c.diff?r1=1.19&r2=1.20&cvsroot=tuhopuu>
  1.7       +435 -39   tuhopuu3/source/blender/src/edit.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/edit.c.diff?r1=1.6&r2=1.7&cvsroot=tuhopuu>
  1.8       +2 -5      tuhopuu3/source/blender/src/editaction.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/editaction.c.diff?r1=1.7&r2=1.8&cvsroot=tuhopuu>
  1.13      +1 -3      tuhopuu3/source/blender/src/editipo.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/editipo.c.diff?r1=1.12&r2=1.13&cvsroot=tuhopuu>
  1.7       +2 -2      tuhopuu3/source/blender/src/editmesh_mods.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/editmesh_mods.c.diff?r1=1.6&r2=1.7&cvsroot=tuhopuu>
  1.4       +45 -23    tuhopuu3/source/blender/src/editmesh_tools.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/editmesh_tools.c.diff?r1=1.3&r2=1.4&cvsroot=tuhopuu>
  1.33      +223 -2059 tuhopuu3/source/blender/src/editobject.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/editobject.c.diff?r1=1.32&r2=1.33&cvsroot=tuhopuu>
  1.12      +7 -0      tuhopuu3/source/blender/src/editscreen.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/editscreen.c.diff?r1=1.11&r2=1.12&cvsroot=tuhopuu>
  1.12      +2 -3      tuhopuu3/source/blender/src/editsima.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/editsima.c.diff?r1=1.11&r2=1.12&cvsroot=tuhopuu>
  1.14      +8 -10     tuhopuu3/source/blender/src/header_image.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/header_image.c.diff?r1=1.13&r2=1.14&cvsroot=tuhopuu>
  1.10      +16 -4     tuhopuu3/source/blender/src/header_info.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/header_info.c.diff?r1=1.9&r2=1.10&cvsroot=tuhopuu>
  1.24      +68 -52    tuhopuu3/source/blender/src/header_view3d.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/header_view3d.c.diff?r1=1.23&r2=1.24&cvsroot=tuhopuu>
  1.15      +5 -2      tuhopuu3/source/blender/src/headerbuttons.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/headerbuttons.c.diff?r1=1.14&r2=1.15&cvsroot=tuhopuu>
  1.25      +20 -6     tuhopuu3/source/blender/src/interface.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/interface.c.diff?r1=1.24&r2=1.25&cvsroot=tuhopuu>
  1.19      +33 -11    tuhopuu3/source/blender/src/resources.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/resources.c.diff?r1=1.18&r2=1.19&cvsroot=tuhopuu>
  1.52      +126 -59   tuhopuu3/source/blender/src/space.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/space.c.diff?r1=1.51&r2=1.52&cvsroot=tuhopuu>
  1.17      +3 -3      tuhopuu3/source/blender/src/toolbox.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/toolbox.c.diff?r1=1.16&r2=1.17&cvsroot=tuhopuu>
  1.28      +244 -103  tuhopuu3/source/blender/src/transform.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/transform.c.diff?r1=1.27&r2=1.28&cvsroot=tuhopuu>
  1.22      +48 -13    tuhopuu3/source/blender/src/transform_constraints.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/transform_constraints.c.diff?r1=1.21&r2=1.22&cvsroot=tuhopuu>
  1.5       +603 -4    tuhopuu3/source/blender/src/transform_conversions.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/transform_conversions.c.diff?r1=1.4&r2=1.5&cvsroot=tuhopuu>
  1.20      +24 -7     tuhopuu3/source/blender/src/transform_generics.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/transform_generics.c.diff?r1=1.19&r2=1.20&cvsroot=tuhopuu>
  1.16      +53 -601   tuhopuu3/source/blender/src/transform_manipulator.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/transform_manipulator.c.diff?r1=1.15&r2=1.16&cvsroot=tuhopuu>
  1.11      +12 -0     tuhopuu3/source/blender/src/usiblender.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/usiblender.c.diff?r1=1.10&r2=1.11&cvsroot=tuhopuu>
  1.6       +5 -0      tuhopuu3/source/blender/src/view.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/view.c.diff?r1=1.5&r2=1.6&cvsroot=tuhopuu>
  1.6       +1 -0      tuhopuu3/source/blender/src/vpaint.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/vpaint.c.diff?r1=1.5&r2=1.6&cvsroot=tuhopuu>
  1.5       +5 -2      tuhopuu3/tools/scons/bs/bs_libs.py
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/tools/scons/bs/bs_libs.py.diff?r1=1.4&r2=1.5&cvsroot=tuhopuu>