[tuhopuu-cvs] CVS commit: tuhopuu3/doc merge-howto-tuhopuu3.txt tuhopuu3/extern/bullet/make/msvc_7_0/Physics_Interface CcdPhysics_vc7.vcproj PhysicsInterfaceCommon_vc7.vcproj tuhopuu3/make/xc_blender/xc_blender.xcode project.pbxproj tuhopuu3/projectfiles/gameengine/gamelogic SCA_gamelogic.dsp tuhopuu3/source/blender/blenkernel BKE_bad_level_calls.h BKE_displist.h ...

Chris Want cwant at ualberta.ca
Tue Aug 9 03:28:38 CEST 2005 

hos (Chris Want) 2005/08/09 03:28:38 CEST

  Modified files:
    tuhopuu3/doc         merge-howto-tuhopuu3.txt 
    tuhopuu3/make/xc_blender/xc_blender.xcode project.pbxproj 
    tuhopuu3/projectfiles/gameengine/gamelogic SCA_gamelogic.dsp 
    tuhopuu3/source/blender/blenkernel BKE_bad_level_calls.h 
                                       BKE_displist.h BKE_global.h 
                                       BKE_subsurf.h SConscript 
    tuhopuu3/source/blender/blenkernel/intern displist.c exotic.c 
                                              subsurf_ccg.c 
    tuhopuu3/source/blender/blenlib BLI_arithb.h SConscript 
    tuhopuu3/source/blender/blenlib/intern arithb.c 
    tuhopuu3/source/blender/blenloader/intern readfile.c 
                                              writefile.c 
    tuhopuu3/source/blender/include BIF_editmesh.h BIF_interface.h 
                                    BIF_resources.h BIF_space.h 
                                    blendef.h butspace.h 
    tuhopuu3/source/blender/makesdna DNA_action_types.h 
                                     DNA_sound_types.h 
    tuhopuu3/source/blender/python/api2_2x NMesh.c 
    tuhopuu3/source/blender/renderconverter/intern 
                                                   convertBlenderScene.c 
    tuhopuu3/source/blender/src butspace.c buttons_logic.c 
                                drawimage.c drawipo.c drawnla.c 
                                drawobject.c drawview.c edit.c 
                                editaction.c editarmature.c 
                                editfont.c editmesh.c 
                                editmesh_mods.c editmesh_tools.c 
                                editobject.c editscreen.c 
                                header_action.c 
                                header_buttonswin.c header_image.c 
                                header_info.c header_seq.c 
                                header_sound.c header_text.c 
                                header_view3d.c headerbuttons.c 
                                interface.c interface_draw.c 
                                interface_panel.c outliner.c 
                                previewrender.c resources.c 
                                space.c toets.c toolbox.c 
                                transform_constraints.c vpaint.c 
    tuhopuu3/source/creator creator.c 
    tuhopuu3/source/gameengine/Ketsji KX_ConvertPhysicsObject.h 
    tuhopuu3/tools/scons/bs bs_libs.py 
  Removed files:
    tuhopuu3/extern/bullet/make/msvc_7_0/Physics_Interface 
                                                           CcdPhysics_vc7.vcproj 
                                                           PhysicsInterfaceCommon_vc7.vcproj 
  
  Log:
  Post-merge conflict resolution
  
  Revision  Changes    Path
  1.31      +2 -2      tuhopuu3/doc/merge-howto-tuhopuu3.txt
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/doc/merge-howto-tuhopuu3.txt.diff?r1=1.30&r2=1.31&cvsroot=tuhopuu>
  1.9       +177 -145  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.8&r2=1.9&cvsroot=tuhopuu>
  1.6       +4 -4      tuhopuu3/projectfiles/gameengine/gamelogic/SCA_gamelogic.dsp
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/projectfiles/gameengine/gamelogic/SCA_gamelogic.dsp.diff?r1=1.5&r2=1.6&cvsroot=tuhopuu>
  1.3       +2 -1      tuhopuu3/source/blender/blenkernel/BKE_bad_level_calls.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/blenkernel/BKE_bad_level_calls.h.diff?r1=1.2&r2=1.3&cvsroot=tuhopuu>
  1.11      +1 -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.10&r2=1.11&cvsroot=tuhopuu>
  1.15      +12 -29    tuhopuu3/source/blender/blenkernel/BKE_global.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/blenkernel/BKE_global.h.diff?r1=1.14&r2=1.15&cvsroot=tuhopuu>
  1.9       +4 -0      tuhopuu3/source/blender/blenkernel/BKE_subsurf.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/blenkernel/BKE_subsurf.h.diff?r1=1.8&r2=1.9&cvsroot=tuhopuu>
  1.11      +1 -0      tuhopuu3/source/blender/blenkernel/SConscript
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/blenkernel/SConscript.diff?r1=1.10&r2=1.11&cvsroot=tuhopuu>
  1.32      +11 -4     tuhopuu3/source/blender/blenkernel/intern/displist.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/blenkernel/intern/displist.c.diff?r1=1.31&r2=1.32&cvsroot=tuhopuu>
  1.7       +1 -1      tuhopuu3/source/blender/blenkernel/intern/exotic.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/blenkernel/intern/exotic.c.diff?r1=1.6&r2=1.7&cvsroot=tuhopuu>
  1.14      +213 -84   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.13&r2=1.14&cvsroot=tuhopuu>
  1.9       +8 -1      tuhopuu3/source/blender/blenlib/BLI_arithb.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/blenlib/BLI_arithb.h.diff?r1=1.8&r2=1.9&cvsroot=tuhopuu>
  1.4       +1 -0      tuhopuu3/source/blender/blenlib/SConscript
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/blenlib/SConscript.diff?r1=1.3&r2=1.4&cvsroot=tuhopuu>
  1.18      +9 -0      tuhopuu3/source/blender/blenlib/intern/arithb.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/blenlib/intern/arithb.c.diff?r1=1.17&r2=1.18&cvsroot=tuhopuu>
  1.34      +3 -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.33&r2=1.34&cvsroot=tuhopuu>
  1.23      +1 -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.22&r2=1.23&cvsroot=tuhopuu>
  1.7       +6 -0      tuhopuu3/source/blender/include/BIF_editmesh.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/include/BIF_editmesh.h.diff?r1=1.6&r2=1.7&cvsroot=tuhopuu>
  1.6       +3 -2      tuhopuu3/source/blender/include/BIF_interface.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/include/BIF_interface.h.diff?r1=1.5&r2=1.6&cvsroot=tuhopuu>
  1.22      +15 -5     tuhopuu3/source/blender/include/BIF_resources.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/include/BIF_resources.h.diff?r1=1.21&r2=1.22&cvsroot=tuhopuu>
  1.4       +12 -0     tuhopuu3/source/blender/include/BIF_space.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/include/BIF_space.h.diff?r1=1.3&r2=1.4&cvsroot=tuhopuu>
  1.19      +7 -0      tuhopuu3/source/blender/include/blendef.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/include/blendef.h.diff?r1=1.18&r2=1.19&cvsroot=tuhopuu>
  1.19      +5 -3      tuhopuu3/source/blender/include/butspace.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/include/butspace.h.diff?r1=1.18&r2=1.19&cvsroot=tuhopuu>
  1.3       +2 -1      tuhopuu3/source/blender/makesdna/DNA_action_types.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/makesdna/DNA_action_types.h.diff?r1=1.2&r2=1.3&cvsroot=tuhopuu>
  1.4       +9 -23     tuhopuu3/source/blender/makesdna/DNA_sound_types.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/makesdna/DNA_sound_types.h.diff?r1=1.3&r2=1.4&cvsroot=tuhopuu>
  1.7       +332 -46   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.6&r2=1.7&cvsroot=tuhopuu>
  1.23      +23 -26    tuhopuu3/source/blender/renderconverter/intern/convertBlenderScene.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/renderconverter/intern/convertBlenderScene.c.diff?r1=1.22&r2=1.23&cvsroot=tuhopuu>
  1.5       +1 -1      tuhopuu3/source/blender/src/butspace.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/butspace.c.diff?r1=1.4&r2=1.5&cvsroot=tuhopuu>
  1.11      +74 -87    tuhopuu3/source/blender/src/buttons_logic.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/buttons_logic.c.diff?r1=1.10&r2=1.11&cvsroot=tuhopuu>
  1.16      +11 -10    tuhopuu3/source/blender/src/drawimage.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/drawimage.c.diff?r1=1.15&r2=1.16&cvsroot=tuhopuu>
  1.11      +1 -1      tuhopuu3/source/blender/src/drawipo.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/drawipo.c.diff?r1=1.10&r2=1.11&cvsroot=tuhopuu>
  1.6       +13 -14    tuhopuu3/source/blender/src/drawnla.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/drawnla.c.diff?r1=1.5&r2=1.6&cvsroot=tuhopuu>
  1.44      +52 -67    tuhopuu3/source/blender/src/drawobject.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/drawobject.c.diff?r1=1.43&r2=1.44&cvsroot=tuhopuu>
  1.35      +3 -4      tuhopuu3/source/blender/src/drawview.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/drawview.c.diff?r1=1.34&r2=1.35&cvsroot=tuhopuu>
  1.13      +0 -1      tuhopuu3/source/blender/src/edit.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/edit.c.diff?r1=1.12&r2=1.13&cvsroot=tuhopuu>
  1.17      +30 -1     tuhopuu3/source/blender/src/editaction.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/editaction.c.diff?r1=1.16&r2=1.17&cvsroot=tuhopuu>
  1.10      +1 -1      tuhopuu3/source/blender/src/editarmature.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/editarmature.c.diff?r1=1.9&r2=1.10&cvsroot=tuhopuu>
  1.16      +11 -5     tuhopuu3/source/blender/src/editfont.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/editfont.c.diff?r1=1.15&r2=1.16&cvsroot=tuhopuu>
  1.9       +10 -8     tuhopuu3/source/blender/src/editmesh.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/editmesh.c.diff?r1=1.8&r2=1.9&cvsroot=tuhopuu>
  1.12      +29 -9     tuhopuu3/source/blender/src/editmesh_mods.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/editmesh_mods.c.diff?r1=1.11&r2=1.12&cvsroot=tuhopuu>
  1.15      +1257 -1057tuhopuu3/source/blender/src/editmesh_tools.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/editmesh_tools.c.diff?r1=1.14&r2=1.15&cvsroot=tuhopuu>
  1.48      +17 -13    tuhopuu3/source/blender/src/editobject.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/editobject.c.diff?r1=1.47&r2=1.48&cvsroot=tuhopuu>
  1.20      +16 -20    tuhopuu3/source/blender/src/editscreen.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/editscreen.c.diff?r1=1.19&r2=1.20&cvsroot=tuhopuu>
  1.6       +3 -3      tuhopuu3/source/blender/src/header_action.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/header_action.c.diff?r1=1.5&r2=1.6&cvsroot=tuhopuu>
  1.7       +3 -3      tuhopuu3/source/blender/src/header_buttonswin.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/header_buttonswin.c.diff?r1=1.6&r2=1.7&cvsroot=tuhopuu>
  1.17      +11 -11    tuhopuu3/source/blender/src/header_image.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/header_image.c.diff?r1=1.16&r2=1.17&cvsroot=tuhopuu>
  1.16      +21 -19    tuhopuu3/source/blender/src/header_info.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/header_info.c.diff?r1=1.15&r2=1.16&cvsroot=tuhopuu>
  1.6       +2 -2      tuhopuu3/source/blender/src/header_seq.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/header_seq.c.diff?r1=1.5&r2=1.6&cvsroot=tuhopuu>
  1.13      +4 -4      tuhopuu3/source/blender/src/header_sound.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/header_sound.c.diff?r1=1.12&r2=1.13&cvsroot=tuhopuu>
  1.15      +3 -3      tuhopuu3/source/blender/src/header_text.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/header_text.c.diff?r1=1.14&r2=1.15&cvsroot=tuhopuu>
  1.37      +20 -16    tuhopuu3/source/blender/src/header_view3d.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/header_view3d.c.diff?r1=1.36&r2=1.37&cvsroot=tuhopuu>
  1.23      +6 -1      tuhopuu3/source/blender/src/headerbuttons.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/headerbuttons.c.diff?r1=1.22&r2=1.23&cvsroot=tuhopuu>
  1.33      +7 -12     tuhopuu3/source/blender/src/interface.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/interface.c.diff?r1=1.32&r2=1.33&cvsroot=tuhopuu>
  1.23      +7 -7      tuhopuu3/source/blender/src/interface_draw.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/interface_draw.c.diff?r1=1.22&r2=1.23&cvsroot=tuhopuu>
  1.7       +1 -2      tuhopuu3/source/blender/src/interface_panel.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/interface_panel.c.diff?r1=1.6&r2=1.7&cvsroot=tuhopuu>
  1.17      +41 -39    tuhopuu3/source/blender/src/outliner.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/outliner.c.diff?r1=1.16&r2=1.17&cvsroot=tuhopuu>
  1.12      +3 -3      tuhopuu3/source/blender/src/previewrender.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/previewrender.c.diff?r1=1.11&r2=1.12&cvsroot=tuhopuu>
  1.24      +320 -17   tuhopuu3/source/blender/src/resources.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/resources.c.diff?r1=1.23&r2=1.24&cvsroot=tuhopuu>
  1.66      +8 -19     tuhopuu3/source/blender/src/space.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/space.c.diff?r1=1.65&r2=1.66&cvsroot=tuhopuu>
  1.14      +1 -1      tuhopuu3/source/blender/src/toets.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/toets.c.diff?r1=1.13&r2=1.14&cvsroot=tuhopuu>
  1.27      +6 -7      tuhopuu3/source/blender/src/toolbox.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/toolbox.c.diff?r1=1.26&r2=1.27&cvsroot=tuhopuu>
  1.30      +1 -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.29&r2=1.30&cvsroot=tuhopuu>
  1.14      +0 -6      tuhopuu3/source/blender/src/vpaint.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/vpaint.c.diff?r1=1.13&r2=1.14&cvsroot=tuhopuu>
  1.3       +3 -1      tuhopuu3/source/creator/creator.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/creator/creator.c.diff?r1=1.2&r2=1.3&cvsroot=tuhopuu>
  1.4       +6 -5      tuhopuu3/source/gameengine/Ketsji/KX_ConvertPhysicsObject.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/gameengine/Ketsji/KX_ConvertPhysicsObject.h.diff?r1=1.3&r2=1.4&cvsroot=tuhopuu>
  1.7       +2 -0      tuhopuu3/tools/scons/bs/bs_libs.py
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/tools/scons/bs/bs_libs.py.diff?r1=1.6&r2=1.7&cvsroot=tuhopuu>

More information about the tuhopuu-cvs mailing list