[tuhopuu-cvs] CVS commit: tuhopuu2 SConstruct tuhopuu2/extern Makefile tuhopuu2/extern/qhull/VisualC6/qhull qhull.dsp tuhopuu2/extern/solid configure.ac Makefile.in aclocal.m4 config.guess config.sub configure tuhopuu2/extern/solid/VisualC6/broad broad.dsp ...

Chris Want cwant at ualberta.ca
Mon Aug 2 23:49:45 CEST 2004


hos (Chris Want) 2004/08/02 23:49:45 CEST

  Modified files:
    .                    SConstruct 
    tuhopuu2/extern      Makefile 
    tuhopuu2/extern/qhull/VisualC6/qhull qhull.dsp 
    tuhopuu2/extern/solid configure.ac 
    tuhopuu2/extern/solid/VisualC6/broad broad.dsp 
    tuhopuu2/extern/solid/VisualC6/complex complex.dsp 
    tuhopuu2/extern/solid/VisualC6/solid solid.dsp 
    tuhopuu2/extern/solid/VisualC6/solid_dll solid_dll.dsp 
    tuhopuu2/extern/solid/examples Makefile.am 
    tuhopuu2/intern/SoundSystem/intern SND_Scene.cpp 
    tuhopuu2/intern/SoundSystem/openal SND_OpenALDevice.cpp 
                                       SND_OpenALDevice.h 
    tuhopuu2/intern/ghost/intern GHOST_WindowCarbon.cpp 
                                 GHOST_WindowCarbon.h 
    tuhopuu2/projectfiles/blender blender.dsp 
    tuhopuu2/projectfiles/blender/BPY_python BPY_python.dsp 
    tuhopuu2/release     Makefile 
    tuhopuu2/release/datafiles blenderbuttons 
    tuhopuu2/source      Makefile nan_link.mk nan_subdirs.mk 
    tuhopuu2/source/blender/blenkernel BKE_displist.h BKE_object.h 
                                       BKE_utildefines.h 
    tuhopuu2/source/blender/blenkernel/bad_level_call_stubs 
                                                            stubs.c 
    tuhopuu2/source/blender/blenkernel/intern blender.c displist.c 
                                              effect.c exotic.c 
                                              ipo.c object.c 
                                              texture.c 
    tuhopuu2/source/blender/blenlib/intern arithb.c 
    tuhopuu2/source/blender/blenloader/intern readfile.c 
    tuhopuu2/source/blender/include BIF_butspace.h BIF_editmesh.h 
                                    BIF_interface.h 
                                    BIF_resources.h BIF_screen.h 
                                    BIF_space.h BSE_editipo.h 
                                    BSE_editipo_types.h blendef.h 
                                    butspace.h interface.h 
                                    mydevice.h 
    tuhopuu2/source/blender/makesdna DNA_camera_types.h 
                                     DNA_curve_types.h 
                                     DNA_effect_types.h 
                                     DNA_ipo_types.h 
                                     DNA_material_types.h 
                                     DNA_mesh_types.h 
                                     DNA_object_types.h 
                                     DNA_scene_types.h 
                                     DNA_userdef_types.h 
                                     DNA_view3d_types.h 
    tuhopuu2/source/blender/python SConscript 
    tuhopuu2/source/blender/render/extern/include render_types.h 
    tuhopuu2/source/blender/render/intern/source initrender.c 
                                                 rendercore.c 
                                                 shadbuf.c 
                                                 texture.c zbuf.c 
    tuhopuu2/source/blender/renderconverter/intern 
                                                   convertBlenderScene.c 
    tuhopuu2/source/blender/src blenderbuttons.c butspace.c 
                                buttons_editing.c buttons_logic.c 
                                buttons_object.c buttons_scene.c 
                                buttons_shading.c drawimage.c 
                                drawipo.c drawmesh.c drawobject.c 
                                drawtext.c drawview.c edit.c 
                                editaction.c editcurve.c 
                                editface.c editipo.c editmesh.c 
                                editnla.c editobject.c 
                                editscreen.c editsound.c 
                                editview.c filesel.c ghostwinlay.c 
                                header_image.c header_info.c 
                                header_view3d.c interface.c 
                                interface_draw.c language.c 
                                renderwin.c space.c toets.c 
                                toolbox.c view.c vpaint.c 
    tuhopuu2/source/blender/yafray/intern export_File.cpp 
    tuhopuu2/source/gameengine/Converter 
                                         BL_BlenderDataConversion.cpp 
                                         BL_MeshDeformer.cpp 
    tuhopuu2/source/gameengine/GamePlayer/ghost GPG_ghost.cpp 
    tuhopuu2/source/gameengine/Ketsji KX_Camera.cpp KX_Camera.h 
                                      KX_CameraIpoSGController.cpp 
                                      KX_SCA_AddObjectActuator.cpp 
                                      KX_Scene.cpp 
                                      KX_SceneActuator.cpp 
                                      KX_TrackToActuator.cpp 
                                      KX_VertexProxy.cpp 
    tuhopuu2/source/gameengine/Physics/Sumo 
                                            SumoPhysicsController.cpp 
    tuhopuu2/source/gameengine/PyDoc GameLogic.py KX_Camera.py 
                                     KX_SCA_AddObjectActuator.py 
                                     KX_SceneActuator.py 
                                     KX_TrackToActuator.py 
    tuhopuu2/source/gameengine/Rasterizer RAS_Polygon.h 
  Removed files:
    tuhopuu2/extern/solid Makefile.in aclocal.m4 config.guess 
                          config.sub configure 
    tuhopuu2/extern/solid/doc Makefile.in 
    tuhopuu2/extern/solid/examples Makefile.in 
    tuhopuu2/extern/solid/examples/dynamics Makefile.in 
    tuhopuu2/extern/solid/include Makefile.in 
    tuhopuu2/extern/solid/src Makefile.in 
    tuhopuu2/extern/solid/src/broad Makefile.in 
    tuhopuu2/extern/solid/src/complex Makefile.in 
    tuhopuu2/extern/solid/src/convex Makefile.in 
    tuhopuu2/release/scripts disp_paint233f.py 
  
  Log:
  Post merge 'conflict resolution'?
  
  Revision  Changes    Path
  1.26      +651 -129  tuhopuu2/SConstruct
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu2/SConstruct.diff?r1=1.25&r2=1.26&cvsroot=tuhopuu>
  1.9       +16 -35    tuhopuu2/extern/Makefile
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu2/extern/Makefile.diff?r1=1.8&r2=1.9&cvsroot=tuhopuu>
  1.4       +192 -180  tuhopuu2/extern/qhull/VisualC6/qhull/qhull.dsp
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu2/extern/qhull/VisualC6/qhull/qhull.dsp.diff?r1=1.3&r2=1.4&cvsroot=tuhopuu>
  1.4       +12 -2     tuhopuu2/extern/solid/configure.ac
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu2/extern/solid/configure.ac.diff?r1=1.3&r2=1.4&cvsroot=tuhopuu>
  1.2       +132 -132  tuhopuu2/extern/solid/VisualC6/broad/broad.dsp
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu2/extern/solid/VisualC6/broad/broad.dsp.diff?r1=1.1&r2=1.2&cvsroot=tuhopuu>
  1.2       +116 -116  tuhopuu2/extern/solid/VisualC6/complex/complex.dsp
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu2/extern/solid/VisualC6/complex/complex.dsp.diff?r1=1.1&r2=1.2&cvsroot=tuhopuu>
  1.2       +148 -140  tuhopuu2/extern/solid/VisualC6/solid/solid.dsp
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu2/extern/solid/VisualC6/solid/solid.dsp.diff?r1=1.1&r2=1.2&cvsroot=tuhopuu>
  1.2       +147 -147  tuhopuu2/extern/solid/VisualC6/solid_dll/solid_dll.dsp
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu2/extern/solid/VisualC6/solid_dll/solid_dll.dsp.diff?r1=1.1&r2=1.2&cvsroot=tuhopuu>
  1.2       +4 -4      tuhopuu2/extern/solid/examples/Makefile.am
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu2/extern/solid/examples/Makefile.am.diff?r1=1.1&r2=1.2&cvsroot=tuhopuu>
  1.4       +1 -3      tuhopuu2/intern/SoundSystem/intern/SND_Scene.cpp
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu2/intern/SoundSystem/intern/SND_Scene.cpp.diff?r1=1.3&r2=1.4&cvsroot=tuhopuu>
  1.8       +16 -3     tuhopuu2/intern/SoundSystem/openal/SND_OpenALDevice.cpp
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu2/intern/SoundSystem/openal/SND_OpenALDevice.cpp.diff?r1=1.7&r2=1.8&cvsroot=tuhopuu>
  1.5       +2 -1      tuhopuu2/intern/SoundSystem/openal/SND_OpenALDevice.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu2/intern/SoundSystem/openal/SND_OpenALDevice.h.diff?r1=1.4&r2=1.5&cvsroot=tuhopuu>
  1.6       +67 -10    tuhopuu2/intern/ghost/intern/GHOST_WindowCarbon.cpp
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu2/intern/ghost/intern/GHOST_WindowCarbon.cpp.diff?r1=1.5&r2=1.6&cvsroot=tuhopuu>
  1.3       +21 -2     tuhopuu2/intern/ghost/intern/GHOST_WindowCarbon.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu2/intern/ghost/intern/GHOST_WindowCarbon.h.diff?r1=1.2&r2=1.3&cvsroot=tuhopuu>
  1.14      +7 -7      tuhopuu2/projectfiles/blender/blender.dsp
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu2/projectfiles/blender/blender.dsp.diff?r1=1.13&r2=1.14&cvsroot=tuhopuu>
  1.7       +25 -9     tuhopuu2/projectfiles/blender/BPY_python/BPY_python.dsp
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu2/projectfiles/blender/BPY_python/BPY_python.dsp.diff?r1=1.6&r2=1.7&cvsroot=tuhopuu>
  1.7       +5 -0      tuhopuu2/release/Makefile
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu2/release/Makefile.diff?r1=1.6&r2=1.7&cvsroot=tuhopuu>
  1.4       +82 -98    tuhopuu2/release/datafiles/blenderbuttons
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu2/release/datafiles/blenderbuttons.diff?r1=1.3&r2=1.4&cvsroot=tuhopuu>
  1.16      +5 -2      tuhopuu2/source/Makefile
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu2/source/Makefile.diff?r1=1.15&r2=1.16&cvsroot=tuhopuu>
  1.16      +5 -5      tuhopuu2/source/nan_link.mk
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu2/source/nan_link.mk.diff?r1=1.15&r2=1.16&cvsroot=tuhopuu>
  1.6       +7 -7      tuhopuu2/source/nan_subdirs.mk
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu2/source/nan_subdirs.mk.diff?r1=1.5&r2=1.6&cvsroot=tuhopuu>
  1.3       +1 -6      tuhopuu2/source/blender/blenkernel/BKE_displist.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu2/source/blender/blenkernel/BKE_displist.h.diff?r1=1.2&r2=1.3&cvsroot=tuhopuu>
  1.3       +3 -1      tuhopuu2/source/blender/blenkernel/BKE_object.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu2/source/blender/blenkernel/BKE_object.h.diff?r1=1.2&r2=1.3&cvsroot=tuhopuu>
  1.3       +6 -1      tuhopuu2/source/blender/blenkernel/BKE_utildefines.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu2/source/blender/blenkernel/BKE_utildefines.h.diff?r1=1.2&r2=1.3&cvsroot=tuhopuu>
  1.4       +3 -0      tuhopuu2/source/blender/blenkernel/bad_level_call_stubs/stubs.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu2/source/blender/blenkernel/bad_level_call_stubs/stubs.c.diff?r1=1.3&r2=1.4&cvsroot=tuhopuu>
  1.8       +11 -5     tuhopuu2/source/blender/blenkernel/intern/blender.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu2/source/blender/blenkernel/intern/blender.c.diff?r1=1.7&r2=1.8&cvsroot=tuhopuu>
  1.15      +3 -2      tuhopuu2/source/blender/blenkernel/intern/displist.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu2/source/blender/blenkernel/intern/displist.c.diff?r1=1.14&r2=1.15&cvsroot=tuhopuu>
  1.23      +211 -96   tuhopuu2/source/blender/blenkernel/intern/effect.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu2/source/blender/blenkernel/intern/effect.c.diff?r1=1.22&r2=1.23&cvsroot=tuhopuu>
  1.13      +17 -9     tuhopuu2/source/blender/blenkernel/intern/exotic.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu2/source/blender/blenkernel/intern/exotic.c.diff?r1=1.12&r2=1.13&cvsroot=tuhopuu>
  1.9       +5 -2      tuhopuu2/source/blender/blenkernel/intern/ipo.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu2/source/blender/blenkernel/intern/ipo.c.diff?r1=1.8&r2=1.9&cvsroot=tuhopuu>
  1.13      +13 -3     tuhopuu2/source/blender/blenkernel/intern/object.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu2/source/blender/blenkernel/intern/object.c.diff?r1=1.12&r2=1.13&cvsroot=tuhopuu>
  1.8       +3 -2      tuhopuu2/source/blender/blenkernel/intern/texture.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu2/source/blender/blenkernel/intern/texture.c.diff?r1=1.7&r2=1.8&cvsroot=tuhopuu>
  1.11      +2 -2      tuhopuu2/source/blender/blenlib/intern/arithb.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu2/source/blender/blenlib/intern/arithb.c.diff?r1=1.10&r2=1.11&cvsroot=tuhopuu>
  1.18      +12 -3     tuhopuu2/source/blender/blenloader/intern/readfile.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu2/source/blender/blenloader/intern/readfile.c.diff?r1=1.17&r2=1.18&cvsroot=tuhopuu>
  1.4       +0 -3      tuhopuu2/source/blender/include/BIF_butspace.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu2/source/blender/include/BIF_butspace.h.diff?r1=1.3&r2=1.4&cvsroot=tuhopuu>
  1.28      +3 -1      tuhopuu2/source/blender/include/BIF_editmesh.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu2/source/blender/include/BIF_editmesh.h.diff?r1=1.27&r2=1.28&cvsroot=tuhopuu>
  1.8       +8 -2      tuhopuu2/source/blender/include/BIF_interface.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu2/source/blender/include/BIF_interface.h.diff?r1=1.7&r2=1.8&cvsroot=tuhopuu>
  1.13      +4 -3      tuhopuu2/source/blender/include/BIF_resources.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu2/source/blender/include/BIF_resources.h.diff?r1=1.12&r2=1.13&cvsroot=tuhopuu>
  1.4       +2 -1      tuhopuu2/source/blender/include/BIF_screen.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu2/source/blender/include/BIF_screen.h.diff?r1=1.3&r2=1.4&cvsroot=tuhopuu>
  1.7       +1 -0      tuhopuu2/source/blender/include/BIF_space.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu2/source/blender/include/BIF_space.h.diff?r1=1.6&r2=1.7&cvsroot=tuhopuu>
  1.6       +16 -14    tuhopuu2/source/blender/include/BSE_editipo.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu2/source/blender/include/BSE_editipo.h.diff?r1=1.5&r2=1.6&cvsroot=tuhopuu>
  1.8       +1 -4      tuhopuu2/source/blender/include/BSE_editipo_types.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu2/source/blender/include/BSE_editipo_types.h.diff?r1=1.7&r2=1.8&cvsroot=tuhopuu>
  1.11      +4 -0      tuhopuu2/source/blender/include/blendef.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu2/source/blender/include/blendef.h.diff?r1=1.10&r2=1.11&cvsroot=tuhopuu>
  1.24      +3 -1      tuhopuu2/source/blender/include/butspace.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu2/source/blender/include/butspace.h.diff?r1=1.23&r2=1.24&cvsroot=tuhopuu>
  1.7       +3 -1      tuhopuu2/source/blender/include/interface.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu2/source/blender/include/interface.h.diff?r1=1.6&r2=1.7&cvsroot=tuhopuu>
  1.7       +2 -0      tuhopuu2/source/blender/include/mydevice.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu2/source/blender/include/mydevice.h.diff?r1=1.6&r2=1.7&cvsroot=tuhopuu>
  1.3       +6 -1      tuhopuu2/source/blender/makesdna/DNA_camera_types.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu2/source/blender/makesdna/DNA_camera_types.h.diff?r1=1.2&r2=1.3&cvsroot=tuhopuu>
  1.3       +3 -2      tuhopuu2/source/blender/makesdna/DNA_curve_types.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu2/source/blender/makesdna/DNA_curve_types.h.diff?r1=1.2&r2=1.3&cvsroot=tuhopuu>
  1.6       +5 -1      tuhopuu2/source/blender/makesdna/DNA_effect_types.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu2/source/blender/makesdna/DNA_effect_types.h.diff?r1=1.5&r2=1.6&cvsroot=tuhopuu>
  1.7       +16 -1     tuhopuu2/source/blender/makesdna/DNA_ipo_types.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu2/source/blender/makesdna/DNA_ipo_types.h.diff?r1=1.6&r2=1.7&cvsroot=tuhopuu>
  1.9       +7 -0      tuhopuu2/source/blender/makesdna/DNA_material_types.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu2/source/blender/makesdna/DNA_material_types.h.diff?r1=1.8&r2=1.9&cvsroot=tuhopuu>
  1.17      +3 -2      tuhopuu2/source/blender/makesdna/DNA_mesh_types.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu2/source/blender/makesdna/DNA_mesh_types.h.diff?r1=1.16&r2=1.17&cvsroot=tuhopuu>
  1.9       +1 -1      tuhopuu2/source/blender/makesdna/DNA_object_types.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu2/source/blender/makesdna/DNA_object_types.h.diff?r1=1.8&r2=1.9&cvsroot=tuhopuu>
  1.19      +9 -9      tuhopuu2/source/blender/makesdna/DNA_scene_types.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu2/source/blender/makesdna/DNA_scene_types.h.diff?r1=1.18&r2=1.19&cvsroot=tuhopuu>
  1.15      +5 -2      tuhopuu2/source/blender/makesdna/DNA_userdef_types.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu2/source/blender/makesdna/DNA_userdef_types.h.diff?r1=1.14&r2=1.15&cvsroot=tuhopuu>
  1.6       +8 -5      tuhopuu2/source/blender/makesdna/DNA_view3d_types.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu2/source/blender/makesdna/DNA_view3d_types.h.diff?r1=1.5&r2=1.6&cvsroot=tuhopuu>
  1.8       +4 -1      tuhopuu2/source/blender/python/SConscript
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu2/source/blender/python/SConscript.diff?r1=1.7&r2=1.8&cvsroot=tuhopuu>
  1.8       +9 -3      tuhopuu2/source/blender/render/extern/include/render_types.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu2/source/blender/render/extern/include/render_types.h.diff?r1=1.7&r2=1.8&cvsroot=tuhopuu>
  1.11      +5 -4      tuhopuu2/source/blender/render/intern/source/initrender.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu2/source/blender/render/intern/source/initrender.c.diff?r1=1.10&r2=1.11&cvsroot=tuhopuu>
  1.14      +161 -160  tuhopuu2/source/blender/render/intern/source/rendercore.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu2/source/blender/render/intern/source/rendercore.c.diff?r1=1.13&r2=1.14&cvsroot=tuhopuu>
  1.5       +8 -10     tuhopuu2/source/blender/render/intern/source/shadbuf.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu2/source/blender/render/intern/source/shadbuf.c.diff?r1=1.4&r2=1.5&cvsroot=tuhopuu>
  1.10      +19 -37    tuhopuu2/source/blender/render/intern/source/texture.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu2/source/blender/render/intern/source/texture.c.diff?r1=1.9&r2=1.10&cvsroot=tuhopuu>
  1.3       +30 -20    tuhopuu2/source/blender/render/intern/source/zbuf.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu2/source/blender/render/intern/source/zbuf.c.diff?r1=1.2&r2=1.3&cvsroot=tuhopuu>
  1.32      +128 -118  tuhopuu2/source/blender/renderconverter/intern/convertBlenderScene.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu2/source/blender/renderconverter/intern/convertBlenderScene.c.diff?r1=1.31&r2=1.32&cvsroot=tuhopuu>
  1.8       +1332 -1396tuhopuu2/source/blender/src/blenderbuttons.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu2/source/blender/src/blenderbuttons.c.diff?r1=1.7&r2=1.8&cvsroot=tuhopuu>
  1.9       +2 -7      tuhopuu2/source/blender/src/butspace.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu2/source/blender/src/butspace.c.diff?r1=1.8&r2=1.9&cvsroot=tuhopuu>
  1.38      +61 -27    tuhopuu2/source/blender/src/buttons_editing.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu2/source/blender/src/buttons_editing.c.diff?r1=1.37&r2=1.38&cvsroot=tuhopuu>
  1.7       +10 -19    tuhopuu2/source/blender/src/buttons_logic.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu2/source/blender/src/buttons_logic.c.diff?r1=1.6&r2=1.7&cvsroot=tuhopuu>
  1.19      +46 -33    tuhopuu2/source/blender/src/buttons_object.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu2/source/blender/src/buttons_object.c.diff?r1=1.18&r2=1.19&cvsroot=tuhopuu>
  1.18      +144 -101  tuhopuu2/source/blender/src/buttons_scene.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu2/source/blender/src/buttons_scene.c.diff?r1=1.17&r2=1.18&cvsroot=tuhopuu>
  1.22      +212 -108  tuhopuu2/source/blender/src/buttons_shading.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu2/source/blender/src/buttons_shading.c.diff?r1=1.21&r2=1.22&cvsroot=tuhopuu>
  1.24      +26 -30    tuhopuu2/source/blender/src/drawimage.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu2/source/blender/src/drawimage.c.diff?r1=1.23&r2=1.24&cvsroot=tuhopuu>
  1.5       +17 -13    tuhopuu2/source/blender/src/drawipo.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu2/source/blender/src/drawipo.c.diff?r1=1.4&r2=1.5&cvsroot=tuhopuu>
  1.25      +6 -6      tuhopuu2/source/blender/src/drawmesh.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu2/source/blender/src/drawmesh.c.diff?r1=1.24&r2=1.25&cvsroot=tuhopuu>
  1.46      +183 -29   tuhopuu2/source/blender/src/drawobject.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu2/source/blender/src/drawobject.c.diff?r1=1.45&r2=1.46&cvsroot=tuhopuu>
  1.8       +3 -5      tuhopuu2/source/blender/src/drawtext.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu2/source/blender/src/drawtext.c.diff?r1=1.7&r2=1.8&cvsroot=tuhopuu>
  1.18      +98 -54    tuhopuu2/source/blender/src/drawview.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu2/source/blender/src/drawview.c.diff?r1=1.17&r2=1.18&cvsroot=tuhopuu>
  1.25      +53 -50    tuhopuu2/source/blender/src/edit.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu2/source/blender/src/edit.c.diff?r1=1.24&r2=1.25&cvsroot=tuhopuu>
  1.9       +18 -1     tuhopuu2/source/blender/src/editaction.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu2/source/blender/src/editaction.c.diff?r1=1.8&r2=1.9&cvsroot=tuhopuu>
  1.3       +31 -21    tuhopuu2/source/blender/src/editcurve.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu2/source/blender/src/editcurve.c.diff?r1=1.2&r2=1.3&cvsroot=tuhopuu>
  1.26      +8 -3      tuhopuu2/source/blender/src/editface.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu2/source/blender/src/editface.c.diff?r1=1.25&r2=1.26&cvsroot=tuhopuu>
  1.13      +152 -383  tuhopuu2/source/blender/src/editipo.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu2/source/blender/src/editipo.c.diff?r1=1.12&r2=1.13&cvsroot=tuhopuu>
  1.109     +98 -65    tuhopuu2/source/blender/src/editmesh.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu2/source/blender/src/editmesh.c.diff?r1=1.108&r2=1.109&cvsroot=tuhopuu>
  1.11      +18 -2     tuhopuu2/source/blender/src/editnla.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu2/source/blender/src/editnla.c.diff?r1=1.10&r2=1.11&cvsroot=tuhopuu>
  1.64      +341 -292  tuhopuu2/source/blender/src/editobject.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu2/source/blender/src/editobject.c.diff?r1=1.63&r2=1.64&cvsroot=tuhopuu>
  1.17      +34 -28    tuhopuu2/source/blender/src/editscreen.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu2/source/blender/src/editscreen.c.diff?r1=1.16&r2=1.17&cvsroot=tuhopuu>
  1.4       +14 -4     tuhopuu2/source/blender/src/editsound.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu2/source/blender/src/editsound.c.diff?r1=1.3&r2=1.4&cvsroot=tuhopuu>
  1.17      +3 -4      tuhopuu2/source/blender/src/editview.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu2/source/blender/src/editview.c.diff?r1=1.16&r2=1.17&cvsroot=tuhopuu>
  1.14      +21 -53    tuhopuu2/source/blender/src/filesel.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu2/source/blender/src/filesel.c.diff?r1=1.13&r2=1.14&cvsroot=tuhopuu>
  1.9       +79 -0     tuhopuu2/source/blender/src/ghostwinlay.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu2/source/blender/src/ghostwinlay.c.diff?r1=1.8&r2=1.9&cvsroot=tuhopuu>
  1.28      +1 -4      tuhopuu2/source/blender/src/header_image.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu2/source/blender/src/header_image.c.diff?r1=1.27&r2=1.28&cvsroot=tuhopuu>
  1.10      +67 -43    tuhopuu2/source/blender/src/header_info.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu2/source/blender/src/header_info.c.diff?r1=1.9&r2=1.10&cvsroot=tuhopuu>
  1.29      +24 -22    tuhopuu2/source/blender/src/header_view3d.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu2/source/blender/src/header_view3d.c.diff?r1=1.28&r2=1.29&cvsroot=tuhopuu>
  1.23      +478 -82   tuhopuu2/source/blender/src/interface.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu2/source/blender/src/interface.c.diff?r1=1.22&r2=1.23&cvsroot=tuhopuu>
  1.6       +166 -36   tuhopuu2/source/blender/src/interface_draw.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu2/source/blender/src/interface_draw.c.diff?r1=1.5&r2=1.6&cvsroot=tuhopuu>
  1.8       +7 -5      tuhopuu2/source/blender/src/language.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu2/source/blender/src/language.c.diff?r1=1.7&r2=1.8&cvsroot=tuhopuu>
  1.10      +36 -14    tuhopuu2/source/blender/src/renderwin.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu2/source/blender/src/renderwin.c.diff?r1=1.9&r2=1.10&cvsroot=tuhopuu>
  1.73      +411 -367  tuhopuu2/source/blender/src/space.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu2/source/blender/src/space.c.diff?r1=1.72&r2=1.73&cvsroot=tuhopuu>
  1.9       +13 -6     tuhopuu2/source/blender/src/toets.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu2/source/blender/src/toets.c.diff?r1=1.8&r2=1.9&cvsroot=tuhopuu>
  1.17      +4 -2      tuhopuu2/source/blender/src/toolbox.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu2/source/blender/src/toolbox.c.diff?r1=1.16&r2=1.17&cvsroot=tuhopuu>
  1.15      +39 -16    tuhopuu2/source/blender/src/view.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu2/source/blender/src/view.c.diff?r1=1.14&r2=1.15&cvsroot=tuhopuu>
  1.15      +29 -25    tuhopuu2/source/blender/src/vpaint.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu2/source/blender/src/vpaint.c.diff?r1=1.14&r2=1.15&cvsroot=tuhopuu>
  1.6       +265 -145  tuhopuu2/source/blender/yafray/intern/export_File.cpp
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu2/source/blender/yafray/intern/export_File.cpp.diff?r1=1.5&r2=1.6&cvsroot=tuhopuu>
  1.22      +8 -5      tuhopuu2/source/gameengine/Converter/BL_BlenderDataConversion.cpp
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu2/source/gameengine/Converter/BL_BlenderDataConversion.cpp.diff?r1=1.21&r2=1.22&cvsroot=tuhopuu>
  1.5       +1 -2      tuhopuu2/source/gameengine/Converter/BL_MeshDeformer.cpp
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu2/source/gameengine/Converter/BL_MeshDeformer.cpp.diff?r1=1.4&r2=1.5&cvsroot=tuhopuu>
  1.12      +2 -2      tuhopuu2/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu2/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp.diff?r1=1.11&r2=1.12&cvsroot=tuhopuu>
  1.12      +157 -4    tuhopuu2/source/gameengine/Ketsji/KX_Camera.cpp
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu2/source/gameengine/Ketsji/KX_Camera.cpp.diff?r1=1.11&r2=1.12&cvsroot=tuhopuu>
  1.6       +7 -1      tuhopuu2/source/gameengine/Ketsji/KX_Camera.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu2/source/gameengine/Ketsji/KX_Camera.h.diff?r1=1.5&r2=1.6&cvsroot=tuhopuu>
  1.3       +2 -2      tuhopuu2/source/gameengine/Ketsji/KX_CameraIpoSGController.cpp
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu2/source/gameengine/Ketsji/KX_CameraIpoSGController.cpp.diff?r1=1.2&r2=1.3&cvsroot=tuhopuu>
  1.3       +15 -9     tuhopuu2/source/gameengine/Ketsji/KX_SCA_AddObjectActuator.cpp
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu2/source/gameengine/Ketsji/KX_SCA_AddObjectActuator.cpp.diff?r1=1.2&r2=1.3&cvsroot=tuhopuu>
  1.12      +1 -2      tuhopuu2/source/gameengine/Ketsji/KX_Scene.cpp
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu2/source/gameengine/Ketsji/KX_Scene.cpp.diff?r1=1.11&r2=1.12&cvsroot=tuhopuu>
  1.6       +8 -3      tuhopuu2/source/gameengine/Ketsji/KX_SceneActuator.cpp
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu2/source/gameengine/Ketsji/KX_SceneActuator.cpp.diff?r1=1.5&r2=1.6&cvsroot=tuhopuu>
  1.3       +15 -8     tuhopuu2/source/gameengine/Ketsji/KX_TrackToActuator.cpp
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu2/source/gameengine/Ketsji/KX_TrackToActuator.cpp.diff?r1=1.2&r2=1.3&cvsroot=tuhopuu>
  1.6       +8 -2      tuhopuu2/source/gameengine/Ketsji/KX_VertexProxy.cpp
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu2/source/gameengine/Ketsji/KX_VertexProxy.cpp.diff?r1=1.5&r2=1.6&cvsroot=tuhopuu>
  1.15      +2 -2      tuhopuu2/source/gameengine/Physics/Sumo/SumoPhysicsController.cpp
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu2/source/gameengine/Physics/Sumo/SumoPhysicsController.cpp.diff?r1=1.14&r2=1.15&cvsroot=tuhopuu>
  1.6       +2 -2      tuhopuu2/source/gameengine/PyDoc/GameLogic.py
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu2/source/gameengine/PyDoc/GameLogic.py.diff?r1=1.5&r2=1.6&cvsroot=tuhopuu>
  1.3       +9 -0      tuhopuu2/source/gameengine/PyDoc/KX_Camera.py
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu2/source/gameengine/PyDoc/KX_Camera.py.diff?r1=1.2&r2=1.3&cvsroot=tuhopuu>
  1.3       +8 -6      tuhopuu2/source/gameengine/PyDoc/KX_SCA_AddObjectActuator.py
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu2/source/gameengine/PyDoc/KX_SCA_AddObjectActuator.py.diff?r1=1.2&r2=1.3&cvsroot=tuhopuu>
  1.2       +5 -3      tuhopuu2/source/gameengine/PyDoc/KX_SceneActuator.py
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu2/source/gameengine/PyDoc/KX_SceneActuator.py.diff?r1=1.1&r2=1.2&cvsroot=tuhopuu>
  1.2       +3 -3      tuhopuu2/source/gameengine/PyDoc/KX_TrackToActuator.py
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu2/source/gameengine/PyDoc/KX_TrackToActuator.py.diff?r1=1.1&r2=1.2&cvsroot=tuhopuu>
  1.3       +2 -2      tuhopuu2/source/gameengine/Rasterizer/RAS_Polygon.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu2/source/gameengine/Rasterizer/RAS_Polygon.h.diff?r1=1.2&r2=1.3&cvsroot=tuhopuu>



More information about the tuhopuu-cvs mailing list