[tuhopuu-cvs] CVS commit: tuhopuu3/doc merge-howto-tuhopuu3.txt tuhopuu3/make/xc_blender/xc_blender.xcode project.pbxproj tuhopuu3/source/blender/blenkernel BKE_displist.h tuhopuu3/source/blender/blenkernel/intern displist.c exotic.c font.c lattice.c object.c subsurf_ccg.c ...

Chris Want cwant at ualberta.ca
Sun Aug 14 22:33:02 CEST 2005


hos (Chris Want) 2005/08/14 22:33:02 CEST

  Modified files:
    tuhopuu3/doc         merge-howto-tuhopuu3.txt 
    tuhopuu3/make/xc_blender/xc_blender.xcode project.pbxproj 
    tuhopuu3/source/blender/blenkernel BKE_displist.h 
    tuhopuu3/source/blender/blenkernel/intern displist.c exotic.c 
                                              font.c lattice.c 
                                              object.c 
                                              subsurf_ccg.c 
    tuhopuu3/source/blender/blenloader/intern readfile.c 
                                              writefile.c 
    tuhopuu3/source/blender/include BDR_drawobject.h 
                                    BDR_editface.h 
                                    BDR_editobject.h 
                                    BIF_editmesh.h blendef.h 
                                    butspace.h 
    tuhopuu3/source/blender/makesdna DNA_curve_types.h 
                                     DNA_object_types.h 
    tuhopuu3/source/blender/python/api2_2x Image.c NMesh.c 
                                           Object.c 
    tuhopuu3/source/blender/render/intern/source rendercore.c 
    tuhopuu3/source/blender/renderconverter/intern 
                                                   convertBlenderScene.c 
    tuhopuu3/source/blender/src buttons_editing.c buttons_object.c 
                                drawobject.c editarmature.c 
                                editcurve.c editdeform.c 
                                editface.c editfont.c editmesh.c 
                                editmesh_mods.c editmesh_tools.c 
                                editobject.c editseq.c editsima.c 
                                editview.c header_image.c 
                                header_seq.c header_view3d.c 
                                interface_draw.c outliner.c 
                                space.c toets.c 
                                transform_conversions.c 
                                transform_manipulator.c view.c 
    tuhopuu3/source/gameengine/Ketsji KX_ConvertPhysicsObject.h 
  
  Log:
  Post-merge conflict resolution
  
  Revision  Changes    Path
  1.32      +6 -5      tuhopuu3/doc/merge-howto-tuhopuu3.txt
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/doc/merge-howto-tuhopuu3.txt.diff?r1=1.31&r2=1.32&cvsroot=tuhopuu>
  1.10      +27 -0     tuhopuu3/make/xc_blender/xc_blender.xcode/project.pbxproj
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/make/xc_blender/xc_blender.xcode/project.pbxproj.diff?r1=1.9&r2=1.10&cvsroot=tuhopuu>
  1.12      +4 -3      tuhopuu3/source/blender/blenkernel/BKE_displist.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/blenkernel/BKE_displist.h.diff?r1=1.11&r2=1.12&cvsroot=tuhopuu>
  1.33      +336 -229  tuhopuu3/source/blender/blenkernel/intern/displist.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/blenkernel/intern/displist.c.diff?r1=1.32&r2=1.33&cvsroot=tuhopuu>
  1.8       +3 -3      tuhopuu3/source/blender/blenkernel/intern/exotic.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/blenkernel/intern/exotic.c.diff?r1=1.7&r2=1.8&cvsroot=tuhopuu>
  1.17      +3 -1      tuhopuu3/source/blender/blenkernel/intern/font.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/blenkernel/intern/font.c.diff?r1=1.16&r2=1.17&cvsroot=tuhopuu>
  1.12      +20 -49    tuhopuu3/source/blender/blenkernel/intern/lattice.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/blenkernel/intern/lattice.c.diff?r1=1.11&r2=1.12&cvsroot=tuhopuu>
  1.19      +17 -60    tuhopuu3/source/blender/blenkernel/intern/object.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/blenkernel/intern/object.c.diff?r1=1.18&r2=1.19&cvsroot=tuhopuu>
  1.15      +76 -155   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.14&r2=1.15&cvsroot=tuhopuu>
  1.35      +64 -30    tuhopuu3/source/blender/blenloader/intern/readfile.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/blenloader/intern/readfile.c.diff?r1=1.34&r2=1.35&cvsroot=tuhopuu>
  1.24      +6 -6      tuhopuu3/source/blender/blenloader/intern/writefile.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/blenloader/intern/writefile.c.diff?r1=1.23&r2=1.24&cvsroot=tuhopuu>
  1.6       +10 -5     tuhopuu3/source/blender/include/BDR_drawobject.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/include/BDR_drawobject.h.diff?r1=1.5&r2=1.6&cvsroot=tuhopuu>
  1.4       +2 -2      tuhopuu3/source/blender/include/BDR_editface.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/include/BDR_editface.h.diff?r1=1.3&r2=1.4&cvsroot=tuhopuu>
  1.6       +3 -0      tuhopuu3/source/blender/include/BDR_editobject.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/include/BDR_editobject.h.diff?r1=1.5&r2=1.6&cvsroot=tuhopuu>
  1.8       +8 -2      tuhopuu3/source/blender/include/BIF_editmesh.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/include/BIF_editmesh.h.diff?r1=1.7&r2=1.8&cvsroot=tuhopuu>
  1.20      +0 -3      tuhopuu3/source/blender/include/blendef.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/include/blendef.h.diff?r1=1.19&r2=1.20&cvsroot=tuhopuu>
  1.20      +1 -3      tuhopuu3/source/blender/include/butspace.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/include/butspace.h.diff?r1=1.19&r2=1.20&cvsroot=tuhopuu>
  1.5       +2 -3      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.4&r2=1.5&cvsroot=tuhopuu>
  1.11      +0 -1      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.10&r2=1.11&cvsroot=tuhopuu>
  1.5       +259 -19   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.4&r2=1.5&cvsroot=tuhopuu>
  1.8       +18 -20    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.7&r2=1.8&cvsroot=tuhopuu>
  1.6       +0 -103    tuhopuu3/source/blender/python/api2_2x/Object.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/python/api2_2x/Object.c.diff?r1=1.5&r2=1.6&cvsroot=tuhopuu>
  1.17      +12 -5     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.16&r2=1.17&cvsroot=tuhopuu>
  1.24      +235 -574  tuhopuu3/source/blender/renderconverter/intern/convertBlenderScene.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/renderconverter/intern/convertBlenderScene.c.diff?r1=1.23&r2=1.24&cvsroot=tuhopuu>
  1.50      +684 -21   tuhopuu3/source/blender/src/buttons_editing.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/buttons_editing.c.diff?r1=1.49&r2=1.50&cvsroot=tuhopuu>
  1.37      +44 -109   tuhopuu3/source/blender/src/buttons_object.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/buttons_object.c.diff?r1=1.36&r2=1.37&cvsroot=tuhopuu>
  1.45      +261 -226  tuhopuu3/source/blender/src/drawobject.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/drawobject.c.diff?r1=1.44&r2=1.45&cvsroot=tuhopuu>
  1.11      +83 -49    tuhopuu3/source/blender/src/editarmature.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/editarmature.c.diff?r1=1.10&r2=1.11&cvsroot=tuhopuu>
  1.8       +68 -116   tuhopuu3/source/blender/src/editcurve.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/editcurve.c.diff?r1=1.7&r2=1.8&cvsroot=tuhopuu>
  1.7       +0 -3      tuhopuu3/source/blender/src/editdeform.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/editdeform.c.diff?r1=1.6&r2=1.7&cvsroot=tuhopuu>
  1.10      +73 -15    tuhopuu3/source/blender/src/editface.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/editface.c.diff?r1=1.9&r2=1.10&cvsroot=tuhopuu>
  1.17      +5 -0      tuhopuu3/source/blender/src/editfont.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/editfont.c.diff?r1=1.16&r2=1.17&cvsroot=tuhopuu>
  1.10      +83 -1     tuhopuu3/source/blender/src/editmesh.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/editmesh.c.diff?r1=1.9&r2=1.10&cvsroot=tuhopuu>
  1.13      +224 -242  tuhopuu3/source/blender/src/editmesh_mods.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/editmesh_mods.c.diff?r1=1.12&r2=1.13&cvsroot=tuhopuu>
  1.16      +178 -244  tuhopuu3/source/blender/src/editmesh_tools.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/editmesh_tools.c.diff?r1=1.15&r2=1.16&cvsroot=tuhopuu>
  1.49      +134 -132  tuhopuu3/source/blender/src/editobject.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/editobject.c.diff?r1=1.48&r2=1.49&cvsroot=tuhopuu>
  1.9       +38 -21    tuhopuu3/source/blender/src/editseq.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/editseq.c.diff?r1=1.8&r2=1.9&cvsroot=tuhopuu>
  1.16      +23 -3     tuhopuu3/source/blender/src/editsima.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/editsima.c.diff?r1=1.15&r2=1.16&cvsroot=tuhopuu>
  1.25      +389 -448  tuhopuu3/source/blender/src/editview.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/editview.c.diff?r1=1.24&r2=1.25&cvsroot=tuhopuu>
  1.18      +14 -13    tuhopuu3/source/blender/src/header_image.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/header_image.c.diff?r1=1.17&r2=1.18&cvsroot=tuhopuu>
  1.7       +5 -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.6&r2=1.7&cvsroot=tuhopuu>
  1.38      +6 -2      tuhopuu3/source/blender/src/header_view3d.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/header_view3d.c.diff?r1=1.37&r2=1.38&cvsroot=tuhopuu>
  1.24      +0 -8      tuhopuu3/source/blender/src/interface_draw.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/interface_draw.c.diff?r1=1.23&r2=1.24&cvsroot=tuhopuu>
  1.18      +39 -24    tuhopuu3/source/blender/src/outliner.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/outliner.c.diff?r1=1.17&r2=1.18&cvsroot=tuhopuu>
  1.67      +17 -11    tuhopuu3/source/blender/src/space.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/space.c.diff?r1=1.66&r2=1.67&cvsroot=tuhopuu>
  1.15      +13 -2     tuhopuu3/source/blender/src/toets.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/toets.c.diff?r1=1.14&r2=1.15&cvsroot=tuhopuu>
  1.18      +9 -4      tuhopuu3/source/blender/src/transform_conversions.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/transform_conversions.c.diff?r1=1.17&r2=1.18&cvsroot=tuhopuu>
  1.27      +46 -51    tuhopuu3/source/blender/src/transform_manipulator.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/transform_manipulator.c.diff?r1=1.26&r2=1.27&cvsroot=tuhopuu>
  1.14      +6 -2      tuhopuu3/source/blender/src/view.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/view.c.diff?r1=1.13&r2=1.14&cvsroot=tuhopuu>
  1.5       +1 -1      tuhopuu3/source/gameengine/Ketsji/KX_ConvertPhysicsObject.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/gameengine/Ketsji/KX_ConvertPhysicsObject.h.diff?r1=1.4&r2=1.5&cvsroot=tuhopuu>



More information about the tuhopuu-cvs mailing list