[tuhopuu-cvs] CVS commit: tuhopuu3/intern/bmfont/intern BMF_BitmapFont.cpp tuhopuu3/projectfiles/blender/src BL_src.dsp tuhopuu3/release/text release_235a.txt release_236.txt release_237.txt tuhopuu3/source nan_definitions.mk tuhopuu3/source/blender/blenkernel BKE_displist.h BKE_font.h ...

Sat Jun 18 21:26:43 CEST 2005

hos (Chris Want) 2005/06/18 21:26:43 CEST

  Modified files:
    tuhopuu3/intern/bmfont/intern BMF_BitmapFont.cpp 
    tuhopuu3/projectfiles/blender/src BL_src.dsp 
    tuhopuu3/source      nan_definitions.mk 
    tuhopuu3/source/blender/blenkernel BKE_displist.h BKE_font.h 
    tuhopuu3/source/blender/blenkernel/intern displist.c font.c 
                                              subsurf_ccg.c 
    tuhopuu3/source/blender/blenlib/intern psfont.c 
    tuhopuu3/source/blender/blenloader/intern readfile.c 
                                              writefile.c 
    tuhopuu3/source/blender/include BIF_editfont.h butspace.h 
    tuhopuu3/source/blender/makesdna DNA_curve_types.h 
                                     DNA_userdef_types.h 
    tuhopuu3/source/blender/python/api2_2x Blender.c Image.c 
                                           windowTheme.c 
    tuhopuu3/source/blender/render/intern/source rendercore.c 
    tuhopuu3/source/blender/renderconverter/intern 
                                                   convertBlenderScene.c 
    tuhopuu3/source/blender/src buttons_editing.c 
                                buttons_shading.c drawobject.c 
                                drawview.c editaction.c editface.c 
                                editfont.c editmesh_tools.c 
                                editobject.c editscreen.c 
                                interface.c toets.c transform.c 
                                transform_constraints.c 
                                transform_conversions.c 
                                transform_generics.c 
                                transform_manipulator.c 
                                transform_numinput.c usiblender.c 
                                view.c 
  Removed files:
    tuhopuu3/release/text release_235a.txt release_236.txt 
                          release_237.txt 
  
  Log:
  Post-merge conflict resolution
  
  Revision  Changes    Path
  1.12      +3 -3      tuhopuu3/intern/bmfont/intern/BMF_BitmapFont.cpp
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/intern/bmfont/intern/BMF_BitmapFont.cpp.diff?r1=1.11&r2=1.12&cvsroot=tuhopuu>
  1.11      +281 -1    tuhopuu3/projectfiles/blender/src/BL_src.dsp
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/projectfiles/blender/src/BL_src.dsp.diff?r1=1.10&r2=1.11&cvsroot=tuhopuu>
  1.6       +1 -1      tuhopuu3/source/nan_definitions.mk
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/nan_definitions.mk.diff?r1=1.5&r2=1.6&cvsroot=tuhopuu>
  1.6       +2 -0      tuhopuu3/source/blender/blenkernel/BKE_displist.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/blenkernel/BKE_displist.h.diff?r1=1.5&r2=1.6&cvsroot=tuhopuu>
  1.4       +10 -1     tuhopuu3/source/blender/blenkernel/BKE_font.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/blenkernel/BKE_font.h.diff?r1=1.3&r2=1.4&cvsroot=tuhopuu>
  1.22      +9 -6      tuhopuu3/source/blender/blenkernel/intern/displist.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/blenkernel/intern/displist.c.diff?r1=1.21&r2=1.22&cvsroot=tuhopuu>
  1.7       +273 -213  tuhopuu3/source/blender/blenkernel/intern/font.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/blenkernel/intern/font.c.diff?r1=1.6&r2=1.7&cvsroot=tuhopuu>
  1.10      +2 -1      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.9&r2=1.10&cvsroot=tuhopuu>
  1.5       +8 -6      tuhopuu3/source/blender/blenlib/intern/psfont.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/blenlib/intern/psfont.c.diff?r1=1.4&r2=1.5&cvsroot=tuhopuu>
  1.23      +22 -1     tuhopuu3/source/blender/blenloader/intern/readfile.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/blenloader/intern/readfile.c.diff?r1=1.22&r2=1.23&cvsroot=tuhopuu>
  1.16      +3 -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.15&r2=1.16&cvsroot=tuhopuu>
  1.4       +4 -0      tuhopuu3/source/blender/include/BIF_editfont.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/include/BIF_editfont.h.diff?r1=1.3&r2=1.4&cvsroot=tuhopuu>
  1.16      +14 -7     tuhopuu3/source/blender/include/butspace.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/include/butspace.h.diff?r1=1.15&r2=1.16&cvsroot=tuhopuu>
  1.3       +47 -5     tuhopuu3/source/blender/makesdna/DNA_curve_types.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/makesdna/DNA_curve_types.h.diff?r1=1.2&r2=1.3&cvsroot=tuhopuu>
  1.18      +2 -2      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.17&r2=1.18&cvsroot=tuhopuu>
  1.13      +1 -1      tuhopuu3/source/blender/python/api2_2x/Blender.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/python/api2_2x/Blender.c.diff?r1=1.12&r2=1.13&cvsroot=tuhopuu>
  1.3       +2 -2      tuhopuu3/source/blender/python/api2_2x/Image.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/python/api2_2x/Image.c.diff?r1=1.2&r2=1.3&cvsroot=tuhopuu>
  1.5       +16 -5     tuhopuu3/source/blender/python/api2_2x/windowTheme.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/python/api2_2x/windowTheme.c.diff?r1=1.4&r2=1.5&cvsroot=tuhopuu>
  1.14      +3 -3      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.13&r2=1.14&cvsroot=tuhopuu>
  1.14      +2 -8      tuhopuu3/source/blender/renderconverter/intern/convertBlenderScene.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/renderconverter/intern/convertBlenderScene.c.diff?r1=1.13&r2=1.14&cvsroot=tuhopuu>
  1.34      +163 -52   tuhopuu3/source/blender/src/buttons_editing.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/buttons_editing.c.diff?r1=1.33&r2=1.34&cvsroot=tuhopuu>
  1.31      +26 -22    tuhopuu3/source/blender/src/buttons_shading.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/buttons_shading.c.diff?r1=1.30&r2=1.31&cvsroot=tuhopuu>
  1.35      +80 -3     tuhopuu3/source/blender/src/drawobject.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/drawobject.c.diff?r1=1.34&r2=1.35&cvsroot=tuhopuu>
  1.25      +8 -4      tuhopuu3/source/blender/src/drawview.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/drawview.c.diff?r1=1.24&r2=1.25&cvsroot=tuhopuu>
  1.9       +1 -1      tuhopuu3/source/blender/src/editaction.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/editaction.c.diff?r1=1.8&r2=1.9&cvsroot=tuhopuu>
  1.8       +1 -1      tuhopuu3/source/blender/src/editface.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/editface.c.diff?r1=1.7&r2=1.8&cvsroot=tuhopuu>
  1.8       +380 -95   tuhopuu3/source/blender/src/editfont.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/editfont.c.diff?r1=1.7&r2=1.8&cvsroot=tuhopuu>
  1.9       +2 -2      tuhopuu3/source/blender/src/editmesh_tools.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/editmesh_tools.c.diff?r1=1.8&r2=1.9&cvsroot=tuhopuu>
  1.37      +70 -2     tuhopuu3/source/blender/src/editobject.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/editobject.c.diff?r1=1.36&r2=1.37&cvsroot=tuhopuu>
  1.17      +3 -1      tuhopuu3/source/blender/src/editscreen.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/editscreen.c.diff?r1=1.16&r2=1.17&cvsroot=tuhopuu>
  1.29      +2 -2      tuhopuu3/source/blender/src/interface.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/interface.c.diff?r1=1.28&r2=1.29&cvsroot=tuhopuu>
  1.10      +5 -2      tuhopuu3/source/blender/src/toets.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/toets.c.diff?r1=1.9&r2=1.10&cvsroot=tuhopuu>
  1.34      +22 -8     tuhopuu3/source/blender/src/transform.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/transform.c.diff?r1=1.33&r2=1.34&cvsroot=tuhopuu>
  1.26      +4 -4      tuhopuu3/source/blender/src/transform_constraints.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/transform_constraints.c.diff?r1=1.25&r2=1.26&cvsroot=tuhopuu>
  1.10      +24 -7     tuhopuu3/source/blender/src/transform_conversions.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/transform_conversions.c.diff?r1=1.9&r2=1.10&cvsroot=tuhopuu>
  1.23      +8 -8      tuhopuu3/source/blender/src/transform_generics.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/transform_generics.c.diff?r1=1.22&r2=1.23&cvsroot=tuhopuu>
  1.20      +19 -1     tuhopuu3/source/blender/src/transform_manipulator.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/transform_manipulator.c.diff?r1=1.19&r2=1.20&cvsroot=tuhopuu>
  1.7       +5 -0      tuhopuu3/source/blender/src/transform_numinput.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/transform_numinput.c.diff?r1=1.6&r2=1.7&cvsroot=tuhopuu>
  1.16      +5 -2      tuhopuu3/source/blender/src/usiblender.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/usiblender.c.diff?r1=1.15&r2=1.16&cvsroot=tuhopuu>
  1.8       +24 -0     tuhopuu3/source/blender/src/view.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/view.c.diff?r1=1.7&r2=1.8&cvsroot=tuhopuu>