[tuhopuu-cvs] CVS commit: tuhopuu3/doc merge-howto-tuhopuu3.txt tuhopuu3/extern/bullet/BulletDynamics/ConstraintSolver OdeConstraintSolver2.cpp OdeConstraintSolver2.h tuhopuu3/projectfiles/blender blender.dsp tuhopuu3/projectfiles/blender/blenkernel BKE_blenkernel.dsp tuhopuu3/projectfiles/blender/blenlib BLI_blenlib.dsp tuhopuu3/source/blender/blenkernel ...

Fri Jul 29 03:41:34 CEST 2005

hos (Chris Want) 2005/07/29 03:41:34 CEST

  Modified files:
    tuhopuu3/doc         merge-howto-tuhopuu3.txt 
    tuhopuu3/projectfiles/blender blender.dsp 
    tuhopuu3/projectfiles/blender/blenkernel BKE_blenkernel.dsp 
    tuhopuu3/projectfiles/blender/blenlib BLI_blenlib.dsp 
    tuhopuu3/source/blender/blenkernel BKE_displist.h SConscript 
    tuhopuu3/source/blender/blenkernel/intern Makefile blender.c 
                                              displist.c exotic.c 
                                              image.c object.c 
    tuhopuu3/source/blender/blenlib SConscript 
    tuhopuu3/source/blender/blenloader/intern readfile.c 
                                              writefile.c 
    tuhopuu3/source/blender/include BDR_editobject.h 
    tuhopuu3/source/blender/makesdna DNA_userdef_types.h 
    tuhopuu3/source/blender/python/api2_2x NMesh.c 
    tuhopuu3/source/blender/src buttons_editing.c drawipo.c 
                                drawview.c edit.c editaction.c 
                                editarmature.c editipo.c 
                                editobject.c editview.c filesel.c 
                                header_action.c header_info.c 
                                headerbuttons.c outliner.c 
                                toolbox.c transform_conversions.c 
                                usiblender.c vpaint.c 
  Removed files:
    tuhopuu3/extern/bullet/BulletDynamics/ConstraintSolver 
                                                           OdeConstraintSolver2.cpp 
                                                           OdeConstraintSolver2.h 
    tuhopuu3/source/blender/include BSE_editaction.h 
                                    BSE_editaction_types.h 
  
  Log:
  Post-merge conflict resolution
  
  Revision  Changes    Path
  1.30      +11 -3     tuhopuu3/doc/merge-howto-tuhopuu3.txt
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/doc/merge-howto-tuhopuu3.txt.diff?r1=1.29&r2=1.30&cvsroot=tuhopuu>
  1.4       +2 -2      tuhopuu3/projectfiles/blender/blender.dsp
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/projectfiles/blender/blender.dsp.diff?r1=1.3&r2=1.4&cvsroot=tuhopuu>
  1.9       +2 -2      tuhopuu3/projectfiles/blender/blenkernel/BKE_blenkernel.dsp
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/projectfiles/blender/blenkernel/BKE_blenkernel.dsp.diff?r1=1.8&r2=1.9&cvsroot=tuhopuu>
  1.3       +294 -298  tuhopuu3/projectfiles/blender/blenlib/BLI_blenlib.dsp
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/projectfiles/blender/blenlib/BLI_blenlib.dsp.diff?r1=1.2&r2=1.3&cvsroot=tuhopuu>
  1.10      +3 -1      tuhopuu3/source/blender/blenkernel/BKE_displist.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/blenkernel/BKE_displist.h.diff?r1=1.9&r2=1.10&cvsroot=tuhopuu>
  1.10      +1 -1      tuhopuu3/source/blender/blenkernel/SConscript
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/blenkernel/SConscript.diff?r1=1.9&r2=1.10&cvsroot=tuhopuu>
  1.5       +3 -0      tuhopuu3/source/blender/blenkernel/intern/Makefile
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/blenkernel/intern/Makefile.diff?r1=1.4&r2=1.5&cvsroot=tuhopuu>
  1.11      +3 -3      tuhopuu3/source/blender/blenkernel/intern/blender.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/blenkernel/intern/blender.c.diff?r1=1.10&r2=1.11&cvsroot=tuhopuu>
  1.30      +161 -122  tuhopuu3/source/blender/blenkernel/intern/displist.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/blenkernel/intern/displist.c.diff?r1=1.29&r2=1.30&cvsroot=tuhopuu>
  1.6       +9 -6      tuhopuu3/source/blender/blenkernel/intern/exotic.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/blenkernel/intern/exotic.c.diff?r1=1.5&r2=1.6&cvsroot=tuhopuu>
  1.7       +8 -7      tuhopuu3/source/blender/blenkernel/intern/image.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/blenkernel/intern/image.c.diff?r1=1.6&r2=1.7&cvsroot=tuhopuu>
  1.18      +8 -14     tuhopuu3/source/blender/blenkernel/intern/object.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/blenkernel/intern/object.c.diff?r1=1.17&r2=1.18&cvsroot=tuhopuu>
  1.3       +1 -0      tuhopuu3/source/blender/blenlib/SConscript
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/blenlib/SConscript.diff?r1=1.2&r2=1.3&cvsroot=tuhopuu>
  1.32      +38 -17    tuhopuu3/source/blender/blenloader/intern/readfile.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/blenloader/intern/readfile.c.diff?r1=1.31&r2=1.32&cvsroot=tuhopuu>
  1.22      +21 -0     tuhopuu3/source/blender/blenloader/intern/writefile.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/blenloader/intern/writefile.c.diff?r1=1.21&r2=1.22&cvsroot=tuhopuu>
  1.5       +0 -4      tuhopuu3/source/blender/include/BDR_editobject.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/include/BDR_editobject.h.diff?r1=1.4&r2=1.5&cvsroot=tuhopuu>
  1.21      +1 -0      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.20&r2=1.21&cvsroot=tuhopuu>
  1.6       +11 -17    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.5&r2=1.6&cvsroot=tuhopuu>
  1.49      +29 -38    tuhopuu3/source/blender/src/buttons_editing.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/buttons_editing.c.diff?r1=1.48&r2=1.49&cvsroot=tuhopuu>
  1.10      +0 -1      tuhopuu3/source/blender/src/drawipo.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/drawipo.c.diff?r1=1.9&r2=1.10&cvsroot=tuhopuu>
  1.34      +30 -3     tuhopuu3/source/blender/src/drawview.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/drawview.c.diff?r1=1.33&r2=1.34&cvsroot=tuhopuu>
  1.12      +22 -8     tuhopuu3/source/blender/src/edit.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/edit.c.diff?r1=1.11&r2=1.12&cvsroot=tuhopuu>
  1.14      +7 -239    tuhopuu3/source/blender/src/editaction.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/editaction.c.diff?r1=1.13&r2=1.14&cvsroot=tuhopuu>
  1.9       +37 -15    tuhopuu3/source/blender/src/editarmature.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/editarmature.c.diff?r1=1.8&r2=1.9&cvsroot=tuhopuu>
  1.21      +1 -1      tuhopuu3/source/blender/src/editipo.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/editipo.c.diff?r1=1.20&r2=1.21&cvsroot=tuhopuu>
  1.47      +121 -17   tuhopuu3/source/blender/src/editobject.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/editobject.c.diff?r1=1.46&r2=1.47&cvsroot=tuhopuu>
  1.24      +2 -2      tuhopuu3/source/blender/src/editview.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/editview.c.diff?r1=1.23&r2=1.24&cvsroot=tuhopuu>
  1.12      +12 -9     tuhopuu3/source/blender/src/filesel.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/filesel.c.diff?r1=1.11&r2=1.12&cvsroot=tuhopuu>
  1.5       +2 -2      tuhopuu3/source/blender/src/header_action.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/header_action.c.diff?r1=1.4&r2=1.5&cvsroot=tuhopuu>
  1.15      +10 -89    tuhopuu3/source/blender/src/header_info.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/header_info.c.diff?r1=1.14&r2=1.15&cvsroot=tuhopuu>
  1.22      +1 -2      tuhopuu3/source/blender/src/headerbuttons.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/headerbuttons.c.diff?r1=1.21&r2=1.22&cvsroot=tuhopuu>
  1.16      +23 -20    tuhopuu3/source/blender/src/outliner.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/outliner.c.diff?r1=1.15&r2=1.16&cvsroot=tuhopuu>
  1.25      +2 -2      tuhopuu3/source/blender/src/toolbox.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/toolbox.c.diff?r1=1.24&r2=1.25&cvsroot=tuhopuu>
  1.17      +16 -16    tuhopuu3/source/blender/src/transform_conversions.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/transform_conversions.c.diff?r1=1.16&r2=1.17&cvsroot=tuhopuu>
  1.23      +13 -5     tuhopuu3/source/blender/src/usiblender.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/usiblender.c.diff?r1=1.22&r2=1.23&cvsroot=tuhopuu>
  1.13      +8 -32     tuhopuu3/source/blender/src/vpaint.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/vpaint.c.diff?r1=1.12&r2=1.13&cvsroot=tuhopuu>