[tuhopuu-cvs] CVS commit: tuhopuu3/intern/bmfont/intern BMF_BitmapFont.cpp tuhopuu3/projectfiles/blender/blenkernel BKE_blenkernel.dsp tuhopuu3/source nan_definitions.mk nan_link.mk tuhopuu3/source/blender/blenkernel BKE_displist.h BKE_text.h SConscript tuhopuu3/source/blender/blenkernel/intern displist.c ...

Sun Apr 10 17:25:23 CEST 2005

hos (Chris Want) 2005/04/10 17:25:23 CEST

  Modified files:
    tuhopuu3/intern/bmfont/intern BMF_BitmapFont.cpp 
    tuhopuu3/projectfiles/blender/blenkernel BKE_blenkernel.dsp 
    tuhopuu3/source      nan_definitions.mk nan_link.mk 
    tuhopuu3/source/blender/blenkernel BKE_displist.h BKE_text.h 
                                       SConscript 
    tuhopuu3/source/blender/blenkernel/intern displist.c 
                                              subsurf_ccg.c 
    tuhopuu3/source/blender/blenlib/intern arithb.c 
    tuhopuu3/source/blender/include BIF_transform.h 
    tuhopuu3/source/blender/makesdna DNA_mesh_types.h 
                                     DNA_object_types.h 
    tuhopuu3/source/blender/renderconverter/intern 
                                                   convertBlenderScene.c 
    tuhopuu3/source/blender/src buttons_editing.c buttons_object.c 
                                drawobject.c drawtext.c 
                                editmball.c space.c transform.c 
                                transform.h 
                                transform_constraints.c 
                                transform_generics.c 
                                transform_manipulator.c vpaint.c 
  Removed files:
    tuhopuu3/source/blender/blenkernel/intern subsurf.c 
  
  Log:
  Post-merge conflict resolution
  
  Revision  Changes    Path
  1.9       +4 -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.8&r2=1.9&cvsroot=tuhopuu>
  1.3       +0 -4      tuhopuu3/projectfiles/blender/blenkernel/BKE_blenkernel.dsp
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/projectfiles/blender/blenkernel/BKE_blenkernel.dsp.diff?r1=1.2&r2=1.3&cvsroot=tuhopuu>
  1.4       +5 -1      tuhopuu3/source/nan_definitions.mk
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/nan_definitions.mk.diff?r1=1.3&r2=1.4&cvsroot=tuhopuu>
  1.3       +2 -2      tuhopuu3/source/nan_link.mk
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/nan_link.mk.diff?r1=1.2&r2=1.3&cvsroot=tuhopuu>
  1.4       +0 -7      tuhopuu3/source/blender/blenkernel/BKE_displist.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/blenkernel/BKE_displist.h.diff?r1=1.3&r2=1.4&cvsroot=tuhopuu>
  1.5       +0 -1      tuhopuu3/source/blender/blenkernel/BKE_text.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/blenkernel/BKE_text.h.diff?r1=1.4&r2=1.5&cvsroot=tuhopuu>
  1.5       +3 -1      tuhopuu3/source/blender/blenkernel/SConscript
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/blenkernel/SConscript.diff?r1=1.4&r2=1.5&cvsroot=tuhopuu>
  1.15      +6 -124    tuhopuu3/source/blender/blenkernel/intern/displist.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/blenkernel/intern/displist.c.diff?r1=1.14&r2=1.15&cvsroot=tuhopuu>
  1.7       +255 -242  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.6&r2=1.7&cvsroot=tuhopuu>
  1.14      +1 -4      tuhopuu3/source/blender/blenlib/intern/arithb.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/blenlib/intern/arithb.c.diff?r1=1.13&r2=1.14&cvsroot=tuhopuu>
  1.5       +7 -5      tuhopuu3/source/blender/include/BIF_transform.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/include/BIF_transform.h.diff?r1=1.4&r2=1.5&cvsroot=tuhopuu>
  1.5       +0 -1      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.4&r2=1.5&cvsroot=tuhopuu>
  1.4       +21 -8     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.3&r2=1.4&cvsroot=tuhopuu>
  1.6       +5 -5      tuhopuu3/source/blender/renderconverter/intern/convertBlenderScene.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/renderconverter/intern/convertBlenderScene.c.diff?r1=1.5&r2=1.6&cvsroot=tuhopuu>
  1.22      +17 -17    tuhopuu3/source/blender/src/buttons_editing.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/buttons_editing.c.diff?r1=1.21&r2=1.22&cvsroot=tuhopuu>
  1.16      +21 -22    tuhopuu3/source/blender/src/buttons_object.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/buttons_object.c.diff?r1=1.15&r2=1.16&cvsroot=tuhopuu>
  1.25      +42 -13    tuhopuu3/source/blender/src/drawobject.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/drawobject.c.diff?r1=1.24&r2=1.25&cvsroot=tuhopuu>
  1.14      +2 -2      tuhopuu3/source/blender/src/drawtext.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/drawtext.c.diff?r1=1.13&r2=1.14&cvsroot=tuhopuu>
  1.6       +1 -1      tuhopuu3/source/blender/src/editmball.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/editmball.c.diff?r1=1.5&r2=1.6&cvsroot=tuhopuu>
  1.43      +5 -3      tuhopuu3/source/blender/src/space.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/space.c.diff?r1=1.42&r2=1.43&cvsroot=tuhopuu>
  1.24      +304 -81   tuhopuu3/source/blender/src/transform.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/transform.c.diff?r1=1.23&r2=1.24&cvsroot=tuhopuu>
  1.18      +5 -1      tuhopuu3/source/blender/src/transform.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/transform.h.diff?r1=1.17&r2=1.18&cvsroot=tuhopuu>
  1.19      +4 -1      tuhopuu3/source/blender/src/transform_constraints.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/transform_constraints.c.diff?r1=1.18&r2=1.19&cvsroot=tuhopuu>
  1.17      +27 -12    tuhopuu3/source/blender/src/transform_generics.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/transform_generics.c.diff?r1=1.16&r2=1.17&cvsroot=tuhopuu>
  1.11      +15 -15    tuhopuu3/source/blender/src/transform_manipulator.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/transform_manipulator.c.diff?r1=1.10&r2=1.11&cvsroot=tuhopuu>
  1.5       +1 -1      tuhopuu3/source/blender/src/vpaint.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/vpaint.c.diff?r1=1.4&r2=1.5&cvsroot=tuhopuu>