[tuhopuu-cvs] CVS commit: tuhopuu3/doc merge-howto-tuhopuu3.txt tuhopuu3/make/xc_blender/xc_blender.xcode project.pbxproj tuhopuu3/source/blender/blenkernel BKE_displist.h BKE_subsurf.h SConscript tuhopuu3/source/blender/blenkernel/bad_level_call_stubs stubs.c tuhopuu3/source/blender/blenkernel/intern displist.c ...

Thu Mar 31 06:19:57 CEST 2005

hos (Chris Want) 2005/03/31 06:19:57 CEST

  Modified files:
    tuhopuu3/doc         merge-howto-tuhopuu3.txt 
    tuhopuu3/make/xc_blender/xc_blender.xcode project.pbxproj 
    tuhopuu3/source/blender/blenkernel BKE_displist.h 
                                       BKE_subsurf.h SConscript 
    tuhopuu3/source/blender/blenkernel/bad_level_call_stubs 
                                                            stubs.c 
    tuhopuu3/source/blender/blenkernel/intern displist.c mball.c 
                                              subsurf.c 
    tuhopuu3/source/blender/blenloader/intern readfile.c 
                                              writefile.c 
    tuhopuu3/source/blender/include BDR_drawobject.h 
                                    BIF_transform.h 
    tuhopuu3/source/blender/makesdna DNA_mesh_types.h 
                                     DNA_meta_types.h 
    tuhopuu3/source/blender/makesdna/intern makesdna.c 
    tuhopuu3/source/blender/renderconverter/intern 
                                                   convertBlenderScene.c 
    tuhopuu3/source/blender/src buttons_editing.c drawobject.c 
                                edit.c editdeform.c editmball.c 
                                editmesh_mods.c editobject.c 
                                editview.c header_view3d.c 
                                interface.c space.c toolbox.c 
                                transform.c transform.h 
                                transform_constraints.c 
                                transform_generics.c 
                                transform_manipulator.c 
  
  Log:
  Post-merge conflict resolution
  
  Revision  Changes    Path
  1.13      +4 -4      tuhopuu3/doc/merge-howto-tuhopuu3.txt
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/doc/merge-howto-tuhopuu3.txt.diff?r1=1.12&r2=1.13&cvsroot=tuhopuu>
  1.3       +27 -32    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.2&r2=1.3&cvsroot=tuhopuu>
  1.3       +4 -5      tuhopuu3/source/blender/blenkernel/BKE_displist.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/blenkernel/BKE_displist.h.diff?r1=1.2&r2=1.3&cvsroot=tuhopuu>
  1.4       +6 -5      tuhopuu3/source/blender/blenkernel/BKE_subsurf.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/blenkernel/BKE_subsurf.h.diff?r1=1.3&r2=1.4&cvsroot=tuhopuu>
  1.3       +1 -0      tuhopuu3/source/blender/blenkernel/SConscript
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/blenkernel/SConscript.diff?r1=1.2&r2=1.3&cvsroot=tuhopuu>
  1.5       +6 -1      tuhopuu3/source/blender/blenkernel/bad_level_call_stubs/stubs.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/blenkernel/bad_level_call_stubs/stubs.c.diff?r1=1.4&r2=1.5&cvsroot=tuhopuu>
  1.9       +191 -207  tuhopuu3/source/blender/blenkernel/intern/displist.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/blenkernel/intern/displist.c.diff?r1=1.8&r2=1.9&cvsroot=tuhopuu>
  1.5       +9 -3      tuhopuu3/source/blender/blenkernel/intern/mball.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/blenkernel/intern/mball.c.diff?r1=1.4&r2=1.5&cvsroot=tuhopuu>
  1.5       +18 -26    tuhopuu3/source/blender/blenkernel/intern/subsurf.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/blenkernel/intern/subsurf.c.diff?r1=1.4&r2=1.5&cvsroot=tuhopuu>
  1.9       +4 -2      tuhopuu3/source/blender/blenloader/intern/readfile.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/blenloader/intern/readfile.c.diff?r1=1.8&r2=1.9&cvsroot=tuhopuu>
  1.6       +1 -4      tuhopuu3/source/blender/blenloader/intern/writefile.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/blenloader/intern/writefile.c.diff?r1=1.5&r2=1.6&cvsroot=tuhopuu>
  1.4       +0 -2      tuhopuu3/source/blender/include/BDR_drawobject.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/include/BDR_drawobject.h.diff?r1=1.3&r2=1.4&cvsroot=tuhopuu>
  1.3       +8 -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.2&r2=1.3&cvsroot=tuhopuu>
  1.3       +11 -5     tuhopuu3/source/blender/makesdna/DNA_mesh_types.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/makesdna/DNA_mesh_types.h.diff?r1=1.2&r2=1.3&cvsroot=tuhopuu>
  1.3       +5 -5      tuhopuu3/source/blender/makesdna/DNA_meta_types.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/makesdna/DNA_meta_types.h.diff?r1=1.2&r2=1.3&cvsroot=tuhopuu>
  1.3       +4 -4      tuhopuu3/source/blender/makesdna/intern/makesdna.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/makesdna/intern/makesdna.c.diff?r1=1.2&r2=1.3&cvsroot=tuhopuu>
  1.3       +41 -51    tuhopuu3/source/blender/renderconverter/intern/convertBlenderScene.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/renderconverter/intern/convertBlenderScene.c.diff?r1=1.2&r2=1.3&cvsroot=tuhopuu>
  1.19      +24 -21    tuhopuu3/source/blender/src/buttons_editing.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/buttons_editing.c.diff?r1=1.18&r2=1.19&cvsroot=tuhopuu>
  1.19      +218 -202  tuhopuu3/source/blender/src/drawobject.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/drawobject.c.diff?r1=1.18&r2=1.19&cvsroot=tuhopuu>
  1.3       +7 -6      tuhopuu3/source/blender/src/edit.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/edit.c.diff?r1=1.2&r2=1.3&cvsroot=tuhopuu>
  1.5       +8 -6      tuhopuu3/source/blender/src/editdeform.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/editdeform.c.diff?r1=1.4&r2=1.5&cvsroot=tuhopuu>
  1.5       +6 -1      tuhopuu3/source/blender/src/editmball.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/editmball.c.diff?r1=1.4&r2=1.5&cvsroot=tuhopuu>
  1.6       +29 -82    tuhopuu3/source/blender/src/editmesh_mods.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/editmesh_mods.c.diff?r1=1.5&r2=1.6&cvsroot=tuhopuu>
  1.23      +13 -8     tuhopuu3/source/blender/src/editobject.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/editobject.c.diff?r1=1.22&r2=1.23&cvsroot=tuhopuu>
  1.11      +4 -4      tuhopuu3/source/blender/src/editview.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/editview.c.diff?r1=1.10&r2=1.11&cvsroot=tuhopuu>
  1.17      +12 -11    tuhopuu3/source/blender/src/header_view3d.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/header_view3d.c.diff?r1=1.16&r2=1.17&cvsroot=tuhopuu>
  1.20      +5 -3      tuhopuu3/source/blender/src/interface.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/interface.c.diff?r1=1.19&r2=1.20&cvsroot=tuhopuu>
  1.38      +20 -24    tuhopuu3/source/blender/src/space.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/space.c.diff?r1=1.37&r2=1.38&cvsroot=tuhopuu>
  1.13      +5 -5      tuhopuu3/source/blender/src/toolbox.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/toolbox.c.diff?r1=1.12&r2=1.13&cvsroot=tuhopuu>
  1.21      +241 -35   tuhopuu3/source/blender/src/transform.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/transform.c.diff?r1=1.20&r2=1.21&cvsroot=tuhopuu>
  1.16      +5 -4      tuhopuu3/source/blender/src/transform.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/transform.h.diff?r1=1.15&r2=1.16&cvsroot=tuhopuu>
  1.17      +3 -1      tuhopuu3/source/blender/src/transform_constraints.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/transform_constraints.c.diff?r1=1.16&r2=1.17&cvsroot=tuhopuu>
  1.15      +6 -5      tuhopuu3/source/blender/src/transform_generics.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/transform_generics.c.diff?r1=1.14&r2=1.15&cvsroot=tuhopuu>
  1.5       +272 -333  tuhopuu3/source/blender/src/transform_manipulator.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/transform_manipulator.c.diff?r1=1.4&r2=1.5&cvsroot=tuhopuu>