[tuhopuu-cvs] CVS commit: tuhopuu3/projectfiles/blender/blenkernel BKE_blenkernel.dsp tuhopuu3/source Makefile tuhopuu3/source/blender/blenkernel SConscript tuhopuu3/source/blender/blenkernel/intern Makefile material.c object.c tuhopuu3/source/blender/blenloader/intern readblenentry.c ...

Wed Jul 27 02:24:29 CEST 2005

hos (Chris Want) 2005/07/27 02:24:29 CEST

  Modified files:
    tuhopuu3/projectfiles/blender/blenkernel BKE_blenkernel.dsp 
    tuhopuu3/source      Makefile 
    tuhopuu3/source/blender/blenkernel SConscript 
    tuhopuu3/source/blender/blenkernel/intern Makefile material.c 
                                              object.c 
    tuhopuu3/source/blender/blenloader/intern readblenentry.c 
                                              readfile.c 
                                              writefile.c 
    tuhopuu3/source/blender/makesdna DNA_mesh_types.h 
    tuhopuu3/source/blender/renderconverter/intern 
                                                   convertBlenderScene.c 
    tuhopuu3/source/blender/src buttons_editing.c buttons_object.c 
                                drawobject.c drawview.c 
                                editarmature.c editcurve.c 
                                editmesh_mods.c editmesh_tools.c 
                                interface.c meshtools.c outliner.c 
                                space.c toolbox.c usiblender.c 
    tuhopuu3/tools/scons/bs bs_libs.py 
  Removed files:
    tuhopuu3/source/blender/python/api2_2x Wave.c Wave.h 
  
  Log:
  Post-merge conflict resolution
  
  Revision  Changes    Path
  1.8       +2 -3      tuhopuu3/projectfiles/blender/blenkernel/BKE_blenkernel.dsp
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/projectfiles/blender/blenkernel/BKE_blenkernel.dsp.diff?r1=1.7&r2=1.8&cvsroot=tuhopuu>
  1.7       +1 -1      tuhopuu3/source/Makefile
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/Makefile.diff?r1=1.6&r2=1.7&cvsroot=tuhopuu>
  1.9       +1 -0      tuhopuu3/source/blender/blenkernel/SConscript
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/blenkernel/SConscript.diff?r1=1.8&r2=1.9&cvsroot=tuhopuu>
  1.4       +2 -1      tuhopuu3/source/blender/blenkernel/intern/Makefile
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/blenkernel/intern/Makefile.diff?r1=1.3&r2=1.4&cvsroot=tuhopuu>
  1.8       +2 -2      tuhopuu3/source/blender/blenkernel/intern/material.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/blenkernel/intern/material.c.diff?r1=1.7&r2=1.8&cvsroot=tuhopuu>
  1.17      +3 -2      tuhopuu3/source/blender/blenkernel/intern/object.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/blenkernel/intern/object.c.diff?r1=1.16&r2=1.17&cvsroot=tuhopuu>
  1.4       +6 -4      tuhopuu3/source/blender/blenloader/intern/readblenentry.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/blenloader/intern/readblenentry.c.diff?r1=1.3&r2=1.4&cvsroot=tuhopuu>
  1.31      +73 -86    tuhopuu3/source/blender/blenloader/intern/readfile.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/blenloader/intern/readfile.c.diff?r1=1.30&r2=1.31&cvsroot=tuhopuu>
  1.21      +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.20&r2=1.21&cvsroot=tuhopuu>
  1.7       +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.6&r2=1.7&cvsroot=tuhopuu>
  1.22      +3 -3      tuhopuu3/source/blender/renderconverter/intern/convertBlenderScene.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/renderconverter/intern/convertBlenderScene.c.diff?r1=1.21&r2=1.22&cvsroot=tuhopuu>
  1.46      +0 -231    tuhopuu3/source/blender/src/buttons_editing.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/buttons_editing.c.diff?r1=1.45&r2=1.46&cvsroot=tuhopuu>
  1.35      +82 -29    tuhopuu3/source/blender/src/buttons_object.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/buttons_object.c.diff?r1=1.34&r2=1.35&cvsroot=tuhopuu>
  1.41      +1 -22     tuhopuu3/source/blender/src/drawobject.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/drawobject.c.diff?r1=1.40&r2=1.41&cvsroot=tuhopuu>
  1.33      +6 -48     tuhopuu3/source/blender/src/drawview.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/drawview.c.diff?r1=1.32&r2=1.33&cvsroot=tuhopuu>
  1.8       +2 -0      tuhopuu3/source/blender/src/editarmature.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/editarmature.c.diff?r1=1.7&r2=1.8&cvsroot=tuhopuu>
  1.7       +2 -0      tuhopuu3/source/blender/src/editcurve.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/editcurve.c.diff?r1=1.6&r2=1.7&cvsroot=tuhopuu>
  1.11      +4 -1      tuhopuu3/source/blender/src/editmesh_mods.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/editmesh_mods.c.diff?r1=1.10&r2=1.11&cvsroot=tuhopuu>
  1.14      +9 -15     tuhopuu3/source/blender/src/editmesh_tools.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/editmesh_tools.c.diff?r1=1.13&r2=1.14&cvsroot=tuhopuu>
  1.31      +8 -0      tuhopuu3/source/blender/src/interface.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/interface.c.diff?r1=1.30&r2=1.31&cvsroot=tuhopuu>
  1.7       +1 -1      tuhopuu3/source/blender/src/meshtools.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/meshtools.c.diff?r1=1.6&r2=1.7&cvsroot=tuhopuu>
  1.15      +119 -24   tuhopuu3/source/blender/src/outliner.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/outliner.c.diff?r1=1.14&r2=1.15&cvsroot=tuhopuu>
  1.65      +5 -2      tuhopuu3/source/blender/src/space.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/space.c.diff?r1=1.64&r2=1.65&cvsroot=tuhopuu>
  1.23      +0 -2      tuhopuu3/source/blender/src/toolbox.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/toolbox.c.diff?r1=1.22&r2=1.23&cvsroot=tuhopuu>
  1.22      +3 -3      tuhopuu3/source/blender/src/usiblender.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/usiblender.c.diff?r1=1.21&r2=1.22&cvsroot=tuhopuu>
  1.6       +3 -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.5&r2=1.6&cvsroot=tuhopuu>