[tuhopuu-cvs] CVS commit: tuhopuu3/doc merge-howto-tuhopuu3.txt tuhopuu3/projectfiles/blender/blenkernel BKE_blenkernel.dsp tuhopuu3/projectfiles/blender/src BL_src.dsp tuhopuu3/source nan_definitions.mk tuhopuu3/source/blender/blenkernel SConscript tuhopuu3/source/blender/blenkernel/intern mball.c ...

Sun May 1 22:13:32 CEST 2005

hos (Chris Want) 2005/05/01 22:13:32 CEST

  Modified files:
    tuhopuu3/doc         merge-howto-tuhopuu3.txt 
    tuhopuu3/projectfiles/blender/blenkernel BKE_blenkernel.dsp 
    tuhopuu3/projectfiles/blender/src BL_src.dsp 
    tuhopuu3/source      nan_definitions.mk 
    tuhopuu3/source/blender/blenkernel SConscript 
    tuhopuu3/source/blender/blenkernel/intern mball.c scene.c 
                                              text.c 
    tuhopuu3/source/blender/blenloader/intern readfile.c 
    tuhopuu3/source/blender/include BIF_editseq.h BIF_editsima.h 
                                    BIF_resources.h 
    tuhopuu3/source/blender/makesdna DNA_scene_types.h 
                                     DNA_space_types.h 
                                     DNA_userdef_types.h 
    tuhopuu3/source/blender/render/intern/source rendercore.c 
    tuhopuu3/source/blender/renderconverter/intern 
                                                   convertBlenderScene.c 
    tuhopuu3/source/blender/src SConscript drawobject.c drawtext.c 
                                drawview.c edit.c editface.c 
                                editmesh_tools.c editobject.c 
                                editscreen.c editseq.c editsima.c 
                                editview.c filesel.c 
                                header_image.c header_seq.c 
                                header_view3d.c interface.c 
                                resources.c space.c toolbox.c 
                                transform.c 
                                transform_manipulator.c view.c 
  
  Log:
  Post-merge conflict resolution
  
  Revision  Changes    Path
  1.18      +4 -4      tuhopuu3/doc/merge-howto-tuhopuu3.txt
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/doc/merge-howto-tuhopuu3.txt.diff?r1=1.17&r2=1.18&cvsroot=tuhopuu>
  1.4       +8 -0      tuhopuu3/projectfiles/blender/blenkernel/BKE_blenkernel.dsp
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/projectfiles/blender/blenkernel/BKE_blenkernel.dsp.diff?r1=1.3&r2=1.4&cvsroot=tuhopuu>
  1.9       +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.8&r2=1.9&cvsroot=tuhopuu>
  1.5       +2 -0      tuhopuu3/source/nan_definitions.mk
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/nan_definitions.mk.diff?r1=1.4&r2=1.5&cvsroot=tuhopuu>
  1.6       +1 -0      tuhopuu3/source/blender/blenkernel/SConscript
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/blenkernel/SConscript.diff?r1=1.5&r2=1.6&cvsroot=tuhopuu>
  1.6       +3 -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.5&r2=1.6&cvsroot=tuhopuu>
  1.8       +21 -2     tuhopuu3/source/blender/blenkernel/intern/scene.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/blenkernel/intern/scene.c.diff?r1=1.7&r2=1.8&cvsroot=tuhopuu>
  1.9       +4 -3      tuhopuu3/source/blender/blenkernel/intern/text.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/blenkernel/intern/text.c.diff?r1=1.8&r2=1.9&cvsroot=tuhopuu>
  1.15      +17 -4     tuhopuu3/source/blender/blenloader/intern/readfile.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/blenloader/intern/readfile.c.diff?r1=1.14&r2=1.15&cvsroot=tuhopuu>
  1.3       +2 -2      tuhopuu3/source/blender/include/BIF_editseq.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/include/BIF_editseq.h.diff?r1=1.2&r2=1.3&cvsroot=tuhopuu>
  1.6       +2 -2      tuhopuu3/source/blender/include/BIF_editsima.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/include/BIF_editsima.h.diff?r1=1.5&r2=1.6&cvsroot=tuhopuu>
  1.14      +2 -2      tuhopuu3/source/blender/include/BIF_resources.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/include/BIF_resources.h.diff?r1=1.13&r2=1.14&cvsroot=tuhopuu>
  1.11      +5 -0      tuhopuu3/source/blender/makesdna/DNA_scene_types.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/makesdna/DNA_scene_types.h.diff?r1=1.10&r2=1.11&cvsroot=tuhopuu>
  1.5       +3 -2      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.4&r2=1.5&cvsroot=tuhopuu>
  1.12      +4 -1      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.11&r2=1.12&cvsroot=tuhopuu>
  1.12      +29 -29    tuhopuu3/source/blender/render/intern/source/rendercore.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/render/intern/source/rendercore.c.diff?r1=1.11&r2=1.12&cvsroot=tuhopuu>
  1.8       +1 -1      tuhopuu3/source/blender/renderconverter/intern/convertBlenderScene.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/renderconverter/intern/convertBlenderScene.c.diff?r1=1.7&r2=1.8&cvsroot=tuhopuu>
  1.10      +1 -0      tuhopuu3/source/blender/src/SConscript
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/SConscript.diff?r1=1.9&r2=1.10&cvsroot=tuhopuu>
  1.28      +63 -29    tuhopuu3/source/blender/src/drawobject.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/drawobject.c.diff?r1=1.27&r2=1.28&cvsroot=tuhopuu>
  1.18      +75 -71    tuhopuu3/source/blender/src/drawtext.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/drawtext.c.diff?r1=1.17&r2=1.18&cvsroot=tuhopuu>
  1.19      +25 -14    tuhopuu3/source/blender/src/drawview.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/drawview.c.diff?r1=1.18&r2=1.19&cvsroot=tuhopuu>
  1.6       +37 -33    tuhopuu3/source/blender/src/edit.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/edit.c.diff?r1=1.5&r2=1.6&cvsroot=tuhopuu>
  1.6       +2 -2      tuhopuu3/source/blender/src/editface.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/editface.c.diff?r1=1.5&r2=1.6&cvsroot=tuhopuu>
  1.3       +62 -8     tuhopuu3/source/blender/src/editmesh_tools.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/editmesh_tools.c.diff?r1=1.2&r2=1.3&cvsroot=tuhopuu>
  1.31      +27 -2002  tuhopuu3/source/blender/src/editobject.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/editobject.c.diff?r1=1.30&r2=1.31&cvsroot=tuhopuu>
  1.11      +2 -0      tuhopuu3/source/blender/src/editscreen.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/editscreen.c.diff?r1=1.10&r2=1.11&cvsroot=tuhopuu>
  1.7       +8 -10     tuhopuu3/source/blender/src/editseq.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/editseq.c.diff?r1=1.6&r2=1.7&cvsroot=tuhopuu>
  1.11      +2 -2      tuhopuu3/source/blender/src/editsima.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/editsima.c.diff?r1=1.10&r2=1.11&cvsroot=tuhopuu>
  1.16      +8 -6      tuhopuu3/source/blender/src/editview.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/editview.c.diff?r1=1.15&r2=1.16&cvsroot=tuhopuu>
  1.5       +33 -31    tuhopuu3/source/blender/src/filesel.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/filesel.c.diff?r1=1.4&r2=1.5&cvsroot=tuhopuu>
  1.13      +4 -4      tuhopuu3/source/blender/src/header_image.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/header_image.c.diff?r1=1.12&r2=1.13&cvsroot=tuhopuu>
  1.5       +1 -1      tuhopuu3/source/blender/src/header_seq.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/header_seq.c.diff?r1=1.4&r2=1.5&cvsroot=tuhopuu>
  1.23      +75 -24    tuhopuu3/source/blender/src/header_view3d.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/header_view3d.c.diff?r1=1.22&r2=1.23&cvsroot=tuhopuu>
  1.24      +2 -2      tuhopuu3/source/blender/src/interface.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/interface.c.diff?r1=1.23&r2=1.24&cvsroot=tuhopuu>
  1.18      +13 -9     tuhopuu3/source/blender/src/resources.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/resources.c.diff?r1=1.17&r2=1.18&cvsroot=tuhopuu>
  1.48      +19 -7     tuhopuu3/source/blender/src/space.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/space.c.diff?r1=1.47&r2=1.48&cvsroot=tuhopuu>
  1.16      +3 -3      tuhopuu3/source/blender/src/toolbox.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/toolbox.c.diff?r1=1.15&r2=1.16&cvsroot=tuhopuu>
  1.27      +65 -2     tuhopuu3/source/blender/src/transform.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/transform.c.diff?r1=1.26&r2=1.27&cvsroot=tuhopuu>
  1.15      +32 -14    tuhopuu3/source/blender/src/transform_manipulator.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/transform_manipulator.c.diff?r1=1.14&r2=1.15&cvsroot=tuhopuu>
  1.5       +27 -25    tuhopuu3/source/blender/src/view.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/view.c.diff?r1=1.4&r2=1.5&cvsroot=tuhopuu>