[tuhopuu-cvs] CVS commit: tuhopuu3/doc merge-howto-tuhopuu3.txt tuhopuu3/source/blender/blenkernel BKE_global.h BKE_subsurf.h tuhopuu3/source/blender/blenkernel/intern blender.c displist.c lattice.c object.c subsurf_ccg.c tuhopuu3/source/blender/blenlib/intern arithb.c tuhopuu3/source/blender/blenloader/intern ...

Mon Jul 25 06:56:52 CEST 2005

hos (Chris Want) 2005/07/25 06:56:51 CEST

  Modified files:
    tuhopuu3/doc         merge-howto-tuhopuu3.txt 
    tuhopuu3/source/blender/blenkernel BKE_global.h BKE_subsurf.h 
    tuhopuu3/source/blender/blenkernel/intern blender.c displist.c 
                                              lattice.c object.c 
                                              subsurf_ccg.c 
    tuhopuu3/source/blender/blenlib/intern arithb.c 
    tuhopuu3/source/blender/blenloader/intern readfile.c 
                                              writefile.c 
    tuhopuu3/source/blender/include BDR_drawobject.h 
                                    BIF_editmesh.h BIF_transform.h 
                                    blendef.h butspace.h 
    tuhopuu3/source/blender/makesdna DNA_space_types.h 
    tuhopuu3/source/blender/makesdna/intern makesdna.c 
    tuhopuu3/source/blender/python/api2_2x NMesh.c 
    tuhopuu3/source/blender/radiosity/intern/source 
                                                    radpreprocess.c 
    tuhopuu3/source/blender/renderconverter/intern 
                                                   convertBlenderScene.c 
    tuhopuu3/source/blender/src butspace.c buttons_editing.c 
                                buttons_object.c drawmesh.c 
                                drawobject.c drawview.c edit.c 
                                editaction.c editarmature.c 
                                editipo.c editmesh.c 
                                editmesh_tools.c editnla.c 
                                editobject.c editoops.c editview.c 
                                header_buttonswin.c header_info.c 
                                header_view3d.c meshtools.c 
                                outliner.c space.c toets.c 
                                toolbox.c transform.c 
                                transform_constraints.c 
                                transform_conversions.c 
                                transform_generics.c 
                                transform_manipulator.c 
                                transform_numinput.c view.c 
                                vpaint.c 
  Removed files:
    tuhopuu3/source/blender/python/api2_2x Build.c Build.h 
  
  Log:
  Post-merge conflict resolution
  
  Revision  Changes    Path
  1.29      +2 -2      tuhopuu3/doc/merge-howto-tuhopuu3.txt
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/doc/merge-howto-tuhopuu3.txt.diff?r1=1.28&r2=1.29&cvsroot=tuhopuu>
  1.14      +19 -20    tuhopuu3/source/blender/blenkernel/BKE_global.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/blenkernel/BKE_global.h.diff?r1=1.13&r2=1.14&cvsroot=tuhopuu>
  1.8       +3 -3      tuhopuu3/source/blender/blenkernel/BKE_subsurf.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/blenkernel/BKE_subsurf.h.diff?r1=1.7&r2=1.8&cvsroot=tuhopuu>
  1.9       +0 -14     tuhopuu3/source/blender/blenkernel/intern/blender.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/blenkernel/intern/blender.c.diff?r1=1.8&r2=1.9&cvsroot=tuhopuu>
  1.28      +84 -102   tuhopuu3/source/blender/blenkernel/intern/displist.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/blenkernel/intern/displist.c.diff?r1=1.27&r2=1.28&cvsroot=tuhopuu>
  1.11      +2 -0      tuhopuu3/source/blender/blenkernel/intern/lattice.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/blenkernel/intern/lattice.c.diff?r1=1.10&r2=1.11&cvsroot=tuhopuu>
  1.15      +31 -22    tuhopuu3/source/blender/blenkernel/intern/object.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/blenkernel/intern/object.c.diff?r1=1.14&r2=1.15&cvsroot=tuhopuu>
  1.12      +542 -550  tuhopuu3/source/blender/blenkernel/intern/subsurf_ccg.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/blenkernel/intern/subsurf_ccg.c.diff?r1=1.11&r2=1.12&cvsroot=tuhopuu>
  1.17      +161 -1    tuhopuu3/source/blender/blenlib/intern/arithb.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/blenlib/intern/arithb.c.diff?r1=1.16&r2=1.17&cvsroot=tuhopuu>
  1.30      +108 -25   tuhopuu3/source/blender/blenloader/intern/readfile.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/blenloader/intern/readfile.c.diff?r1=1.29&r2=1.30&cvsroot=tuhopuu>
  1.20      +0 -3      tuhopuu3/source/blender/blenloader/intern/writefile.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/blenloader/intern/writefile.c.diff?r1=1.19&r2=1.20&cvsroot=tuhopuu>
  1.5       +0 -1      tuhopuu3/source/blender/include/BDR_drawobject.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/include/BDR_drawobject.h.diff?r1=1.4&r2=1.5&cvsroot=tuhopuu>
  1.6       +1 -2      tuhopuu3/source/blender/include/BIF_editmesh.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/include/BIF_editmesh.h.diff?r1=1.5&r2=1.6&cvsroot=tuhopuu>
  1.11      +2 -0      tuhopuu3/source/blender/include/BIF_transform.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/include/BIF_transform.h.diff?r1=1.10&r2=1.11&cvsroot=tuhopuu>
  1.18      +2 -6      tuhopuu3/source/blender/include/blendef.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/include/blendef.h.diff?r1=1.17&r2=1.18&cvsroot=tuhopuu>
  1.18      +15 -11    tuhopuu3/source/blender/include/butspace.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/include/butspace.h.diff?r1=1.17&r2=1.18&cvsroot=tuhopuu>
  1.10      +1 -20     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.9&r2=1.10&cvsroot=tuhopuu>
  1.7       +28 -36    tuhopuu3/source/blender/makesdna/intern/makesdna.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/makesdna/intern/makesdna.c.diff?r1=1.6&r2=1.7&cvsroot=tuhopuu>
  1.5       +17 -23    tuhopuu3/source/blender/python/api2_2x/NMesh.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/python/api2_2x/NMesh.c.diff?r1=1.4&r2=1.5&cvsroot=tuhopuu>
  1.4       +3 -3      tuhopuu3/source/blender/radiosity/intern/source/radpreprocess.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/radiosity/intern/source/radpreprocess.c.diff?r1=1.3&r2=1.4&cvsroot=tuhopuu>
  1.21      +77 -141   tuhopuu3/source/blender/renderconverter/intern/convertBlenderScene.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/renderconverter/intern/convertBlenderScene.c.diff?r1=1.20&r2=1.21&cvsroot=tuhopuu>
  1.4       +4 -1      tuhopuu3/source/blender/src/butspace.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/butspace.c.diff?r1=1.3&r2=1.4&cvsroot=tuhopuu>
  1.44      +51 -20    tuhopuu3/source/blender/src/buttons_editing.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/buttons_editing.c.diff?r1=1.43&r2=1.44&cvsroot=tuhopuu>
  1.34      +76 -40    tuhopuu3/source/blender/src/buttons_object.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/buttons_object.c.diff?r1=1.33&r2=1.34&cvsroot=tuhopuu>
  1.5       +0 -1      tuhopuu3/source/blender/src/drawmesh.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/drawmesh.c.diff?r1=1.4&r2=1.5&cvsroot=tuhopuu>
  1.40      +39 -85    tuhopuu3/source/blender/src/drawobject.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/drawobject.c.diff?r1=1.39&r2=1.40&cvsroot=tuhopuu>
  1.31      +3 -3      tuhopuu3/source/blender/src/drawview.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/drawview.c.diff?r1=1.30&r2=1.31&cvsroot=tuhopuu>
  1.11      +78 -83    tuhopuu3/source/blender/src/edit.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/edit.c.diff?r1=1.10&r2=1.11&cvsroot=tuhopuu>
  1.13      +74 -84    tuhopuu3/source/blender/src/editaction.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/editaction.c.diff?r1=1.12&r2=1.13&cvsroot=tuhopuu>
  1.7       +123 -99   tuhopuu3/source/blender/src/editarmature.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/editarmature.c.diff?r1=1.6&r2=1.7&cvsroot=tuhopuu>
  1.20      +12 -15    tuhopuu3/source/blender/src/editipo.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/editipo.c.diff?r1=1.19&r2=1.20&cvsroot=tuhopuu>
  1.8       +19 -33    tuhopuu3/source/blender/src/editmesh.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/editmesh.c.diff?r1=1.7&r2=1.8&cvsroot=tuhopuu>
  1.13      +70 -25    tuhopuu3/source/blender/src/editmesh_tools.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/editmesh_tools.c.diff?r1=1.12&r2=1.13&cvsroot=tuhopuu>
  1.8       +3 -2      tuhopuu3/source/blender/src/editnla.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/editnla.c.diff?r1=1.7&r2=1.8&cvsroot=tuhopuu>
  1.45      +250 -269  tuhopuu3/source/blender/src/editobject.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/editobject.c.diff?r1=1.44&r2=1.45&cvsroot=tuhopuu>
  1.4       +2 -2      tuhopuu3/source/blender/src/editoops.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/editoops.c.diff?r1=1.3&r2=1.4&cvsroot=tuhopuu>
  1.22      +410 -295  tuhopuu3/source/blender/src/editview.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/editview.c.diff?r1=1.21&r2=1.22&cvsroot=tuhopuu>
  1.6       +1 -100    tuhopuu3/source/blender/src/header_buttonswin.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/header_buttonswin.c.diff?r1=1.5&r2=1.6&cvsroot=tuhopuu>
  1.14      +2 -3      tuhopuu3/source/blender/src/header_info.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/header_info.c.diff?r1=1.13&r2=1.14&cvsroot=tuhopuu>
  1.34      +69 -183   tuhopuu3/source/blender/src/header_view3d.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/header_view3d.c.diff?r1=1.33&r2=1.34&cvsroot=tuhopuu>
  1.6       +0 -190    tuhopuu3/source/blender/src/meshtools.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/meshtools.c.diff?r1=1.5&r2=1.6&cvsroot=tuhopuu>
  1.14      +4 -10     tuhopuu3/source/blender/src/outliner.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/outliner.c.diff?r1=1.13&r2=1.14&cvsroot=tuhopuu>
  1.63      +33 -44    tuhopuu3/source/blender/src/space.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/space.c.diff?r1=1.62&r2=1.63&cvsroot=tuhopuu>
  1.13      +3 -5      tuhopuu3/source/blender/src/toets.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/toets.c.diff?r1=1.12&r2=1.13&cvsroot=tuhopuu>
  1.22      +0 -3      tuhopuu3/source/blender/src/toolbox.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/toolbox.c.diff?r1=1.21&r2=1.22&cvsroot=tuhopuu>
  1.37      +117 -69   tuhopuu3/source/blender/src/transform.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/transform.c.diff?r1=1.36&r2=1.37&cvsroot=tuhopuu>
  1.29      +171 -131  tuhopuu3/source/blender/src/transform_constraints.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/transform_constraints.c.diff?r1=1.28&r2=1.29&cvsroot=tuhopuu>
  1.16      +35 -35    tuhopuu3/source/blender/src/transform_conversions.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/transform_conversions.c.diff?r1=1.15&r2=1.16&cvsroot=tuhopuu>
  1.27      +15 -19    tuhopuu3/source/blender/src/transform_generics.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/transform_generics.c.diff?r1=1.26&r2=1.27&cvsroot=tuhopuu>
  1.25      +54 -38    tuhopuu3/source/blender/src/transform_manipulator.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/transform_manipulator.c.diff?r1=1.24&r2=1.25&cvsroot=tuhopuu>
  1.8       +3 -21     tuhopuu3/source/blender/src/transform_numinput.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/transform_numinput.c.diff?r1=1.7&r2=1.8&cvsroot=tuhopuu>
  1.13      +13 -13    tuhopuu3/source/blender/src/view.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/view.c.diff?r1=1.12&r2=1.13&cvsroot=tuhopuu>
  1.12      +0 -1      tuhopuu3/source/blender/src/vpaint.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/vpaint.c.diff?r1=1.11&r2=1.12&cvsroot=tuhopuu>