[tuhopuu-cvs] CVS commit: tuhopuu3/doc merge-howto-tuhopuu3.txt tuhopuu3/projectfiles/blender/src BL_src.dsp tuhopuu3/projectfiles/gameengine/gamelogic SCA_gamelogic.dsp tuhopuu3/source nan_compile.mk tuhopuu3/source/blender/blenkernel BKE_subsurf.h tuhopuu3/source/blender/blenkernel/intern displist.c ...

Sun Apr 3 22:36:26 CEST 2005

hos (Chris Want) 2005/04/03 22:36:26 CEST

  Modified files:
    tuhopuu3/doc         merge-howto-tuhopuu3.txt 
    tuhopuu3/projectfiles/blender/src BL_src.dsp 
    tuhopuu3/projectfiles/gameengine/gamelogic SCA_gamelogic.dsp 
    tuhopuu3/source      nan_compile.mk 
    tuhopuu3/source/blender/blenkernel BKE_subsurf.h 
    tuhopuu3/source/blender/blenkernel/intern displist.c lattice.c 
                                              library.c object.c 
                                              subsurf.c 
                                              subsurf_ccg.c 
    tuhopuu3/source/blender/blenlib BLI_arithb.h BLI_winstuff.h 
    tuhopuu3/source/blender/blenlib/intern arithb.c 
    tuhopuu3/source/blender/blenloader/intern readfile.c 
                                              writefile.c 
    tuhopuu3/source/blender/include BIF_transform.h blendef.h 
                                    butspace.h 
    tuhopuu3/source/blender/makesdna DNA_mesh_types.h 
                                     DNA_object_types.h 
    tuhopuu3/source/blender/src buttons_editing.c buttons_logic.c 
                                buttons_object.c buttons_scene.c 
                                buttons_shading.c drawnla.c 
                                drawobject.c drawview.c editipo.c 
                                editnla.c editobject.c filesel.c 
                                header_buttonswin.c 
                                header_view3d.c space.c 
                                transform.c transform.h 
                                transform_constraints.c 
                                transform_generics.c 
                                transform_manipulator.c 
                                transform_numinput.c usiblender.c 
                                vpaint.c 
  
  Log:
  Post-merge conflict resolution
  
  Revision  Changes    Path
  1.14      +4 -4      tuhopuu3/doc/merge-howto-tuhopuu3.txt
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/doc/merge-howto-tuhopuu3.txt.diff?r1=1.13&r2=1.14&cvsroot=tuhopuu>
  1.5       +4 -0      tuhopuu3/projectfiles/blender/src/BL_src.dsp
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/projectfiles/blender/src/BL_src.dsp.diff?r1=1.4&r2=1.5&cvsroot=tuhopuu>
  1.5       +4 -4      tuhopuu3/projectfiles/gameengine/gamelogic/SCA_gamelogic.dsp
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/projectfiles/gameengine/gamelogic/SCA_gamelogic.dsp.diff?r1=1.4&r2=1.5&cvsroot=tuhopuu>
  1.5       +0 -15     tuhopuu3/source/nan_compile.mk
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/nan_compile.mk.diff?r1=1.4&r2=1.5&cvsroot=tuhopuu>
  1.5       +4 -13     tuhopuu3/source/blender/blenkernel/BKE_subsurf.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/blenkernel/BKE_subsurf.h.diff?r1=1.4&r2=1.5&cvsroot=tuhopuu>
  1.13      +4 -2      tuhopuu3/source/blender/blenkernel/intern/displist.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/blenkernel/intern/displist.c.diff?r1=1.12&r2=1.13&cvsroot=tuhopuu>
  1.6       +2 -2      tuhopuu3/source/blender/blenkernel/intern/lattice.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/blenkernel/intern/lattice.c.diff?r1=1.5&r2=1.6&cvsroot=tuhopuu>
  1.3       +2 -2      tuhopuu3/source/blender/blenkernel/intern/library.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/blenkernel/intern/library.c.diff?r1=1.2&r2=1.3&cvsroot=tuhopuu>
  1.6       +3 -3      tuhopuu3/source/blender/blenkernel/intern/object.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/blenkernel/intern/object.c.diff?r1=1.5&r2=1.6&cvsroot=tuhopuu>
  1.8       +10 -14    tuhopuu3/source/blender/blenkernel/intern/subsurf.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/blenkernel/intern/subsurf.c.diff?r1=1.7&r2=1.8&cvsroot=tuhopuu>
  1.3       +103 -66   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.2&r2=1.3&cvsroot=tuhopuu>
  1.7       +4 -0      tuhopuu3/source/blender/blenlib/BLI_arithb.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/blenlib/BLI_arithb.h.diff?r1=1.6&r2=1.7&cvsroot=tuhopuu>
  1.3       +1 -5      tuhopuu3/source/blender/blenlib/BLI_winstuff.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/blenlib/BLI_winstuff.h.diff?r1=1.2&r2=1.3&cvsroot=tuhopuu>
  1.12      +6 -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.11&r2=1.12&cvsroot=tuhopuu>
  1.11      +32 -3     tuhopuu3/source/blender/blenloader/intern/readfile.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/blenloader/intern/readfile.c.diff?r1=1.10&r2=1.11&cvsroot=tuhopuu>
  1.8       +2 -1      tuhopuu3/source/blender/blenloader/intern/writefile.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/blenloader/intern/writefile.c.diff?r1=1.7&r2=1.8&cvsroot=tuhopuu>
  1.4       +4 -3      tuhopuu3/source/blender/include/BIF_transform.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/include/BIF_transform.h.diff?r1=1.3&r2=1.4&cvsroot=tuhopuu>
  1.10      +4 -1      tuhopuu3/source/blender/include/blendef.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/include/blendef.h.diff?r1=1.9&r2=1.10&cvsroot=tuhopuu>
  1.8       +4 -2      tuhopuu3/source/blender/include/butspace.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/include/butspace.h.diff?r1=1.7&r2=1.8&cvsroot=tuhopuu>
  1.4       +0 -3      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.3&r2=1.4&cvsroot=tuhopuu>
  1.3       +38 -4     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.2&r2=1.3&cvsroot=tuhopuu>
  1.20      +18 -11    tuhopuu3/source/blender/src/buttons_editing.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/buttons_editing.c.diff?r1=1.19&r2=1.20&cvsroot=tuhopuu>
  1.7       +5 -5      tuhopuu3/source/blender/src/buttons_logic.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/buttons_logic.c.diff?r1=1.6&r2=1.7&cvsroot=tuhopuu>
  1.12      +100 -55   tuhopuu3/source/blender/src/buttons_object.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/buttons_object.c.diff?r1=1.11&r2=1.12&cvsroot=tuhopuu>
  1.15      +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.14&r2=1.15&cvsroot=tuhopuu>
  1.23      +4 -4      tuhopuu3/source/blender/src/buttons_shading.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/buttons_shading.c.diff?r1=1.22&r2=1.23&cvsroot=tuhopuu>
  1.4       +8 -8      tuhopuu3/source/blender/src/drawnla.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/drawnla.c.diff?r1=1.3&r2=1.4&cvsroot=tuhopuu>
  1.23      +23 -21    tuhopuu3/source/blender/src/drawobject.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/drawobject.c.diff?r1=1.22&r2=1.23&cvsroot=tuhopuu>
  1.17      +39 -4     tuhopuu3/source/blender/src/drawview.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/drawview.c.diff?r1=1.16&r2=1.17&cvsroot=tuhopuu>
  1.9       +0 -2      tuhopuu3/source/blender/src/editipo.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/editipo.c.diff?r1=1.8&r2=1.9&cvsroot=tuhopuu>
  1.3       +12 -12    tuhopuu3/source/blender/src/editnla.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/editnla.c.diff?r1=1.2&r2=1.3&cvsroot=tuhopuu>
  1.25      +3 -10     tuhopuu3/source/blender/src/editobject.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/editobject.c.diff?r1=1.24&r2=1.25&cvsroot=tuhopuu>
  1.3       +4 -4      tuhopuu3/source/blender/src/filesel.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/filesel.c.diff?r1=1.2&r2=1.3&cvsroot=tuhopuu>
  1.4       +1 -1      tuhopuu3/source/blender/src/header_buttonswin.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/header_buttonswin.c.diff?r1=1.3&r2=1.4&cvsroot=tuhopuu>
  1.19      +14 -14    tuhopuu3/source/blender/src/header_view3d.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/header_view3d.c.diff?r1=1.18&r2=1.19&cvsroot=tuhopuu>
  1.40      +16 -11    tuhopuu3/source/blender/src/space.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/space.c.diff?r1=1.39&r2=1.40&cvsroot=tuhopuu>
  1.23      +205 -126  tuhopuu3/source/blender/src/transform.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/transform.c.diff?r1=1.22&r2=1.23&cvsroot=tuhopuu>
  1.17      +16 -8     tuhopuu3/source/blender/src/transform.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/transform.h.diff?r1=1.16&r2=1.17&cvsroot=tuhopuu>
  1.18      +3 -6      tuhopuu3/source/blender/src/transform_constraints.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/transform_constraints.c.diff?r1=1.17&r2=1.18&cvsroot=tuhopuu>
  1.16      +30 -16    tuhopuu3/source/blender/src/transform_generics.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/transform_generics.c.diff?r1=1.15&r2=1.16&cvsroot=tuhopuu>
  1.9       +599 -87   tuhopuu3/source/blender/src/transform_manipulator.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/transform_manipulator.c.diff?r1=1.8&r2=1.9&cvsroot=tuhopuu>
  1.5       +6 -6      tuhopuu3/source/blender/src/transform_numinput.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/transform_numinput.c.diff?r1=1.4&r2=1.5&cvsroot=tuhopuu>
  1.9       +4 -3      tuhopuu3/source/blender/src/usiblender.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/usiblender.c.diff?r1=1.8&r2=1.9&cvsroot=tuhopuu>
  1.4       +5 -2      tuhopuu3/source/blender/src/vpaint.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/vpaint.c.diff?r1=1.3&r2=1.4&cvsroot=tuhopuu>