[tuhopuu-cvs] CVS commit: tuhopuu2 README SConstruct tuhopuu2/bin/.blender/locale/pt_BR/LC_MESSAGES blender.mo tuhopuu2/doc autoconfig.txt tuhopuu2/intern/SoundSystem/openal SND_OpenALDevice.cpp tuhopuu2/intern/ghost/intern GHOST_WindowX11.cpp tuhopuu2/projectfiles/blender/BPY_python ...

Chris Want cwant at ualberta.ca
Mon Sep 6 23:51:56 CEST 2004 

hos (Chris Want) 2004/09/06 23:51:56 CEST

  Modified files:
    .                    README SConstruct 
    tuhopuu2/intern/SoundSystem/openal SND_OpenALDevice.cpp 
    tuhopuu2/intern/ghost/intern GHOST_WindowX11.cpp 
    tuhopuu2/projectfiles/blender/BPY_python BPY_python.dsp 
    tuhopuu2/projectfiles/blender/loader BLO_loader.dsp 
    tuhopuu2/source      Makefile nan_warn.mk 
    tuhopuu2/source/blender/blenkernel BKE_constraint.h 
                                       BKE_displist.h BKE_global.h 
    tuhopuu2/source/blender/blenkernel/intern blender.c 
                                              constraint.c 
                                              displist.c ipo.c 
                                              object.c scene.c 
    tuhopuu2/source/blender/blenlib/intern storage.c 
    tuhopuu2/source/blender/blenloader SConscript 
    tuhopuu2/source/blender/blenloader/intern readfile.c 
                                              writefile.c 
    tuhopuu2/source/blender/include BDR_unwrapper.h 
                                    BIF_editconstraint.h 
                                    BIF_editmesh.h BIF_resources.h 
                                    butspace.h interface.h 
    tuhopuu2/source/blender/makesdna DNA_constraint_types.h 
                                     DNA_curve_types.h 
                                     DNA_ipo_types.h 
                                     DNA_space_types.h 
                                     DNA_userdef_types.h 
    tuhopuu2/source/blender/python SConscript 
    tuhopuu2/source/blender/python/api2_2x Object.c Texture.c 
    tuhopuu2/source/blender/render/intern/source rendercore.c 
    tuhopuu2/source/blender/renderconverter/intern 
                                                   convertBlenderScene.c 
    tuhopuu2/source/blender/src buttons_editing.c buttons_object.c 
                                drawimage.c drawobject.c 
                                drawview.c editaction.c 
                                editconstraint.c editcurve.c 
                                editface.c editipo.c editkey.c 
                                editmesh.c editobject.c 
                                editscreen.c header_image.c 
                                header_info.c header_view3d.c 
                                interface.c interface_draw.c 
                                oops.c resources.c space.c toets.c 
                                toolbox.c unwrapper.c usiblender.c 
    tuhopuu2/source/blender/yafray/intern export_File.cpp 
    tuhopuu2/source/gameengine/GamePlayer/common GPC_Canvas.cpp 
    tuhopuu2/source/gameengine/GamePlayer/ghost 
                                                GPG_Application.cpp 
    tuhopuu2/source/gameengine/Ketsji KX_RaySensor.cpp 
                                      KX_SCA_AddObjectActuator.cpp 
                                      KX_SceneActuator.cpp 
                                      KX_TrackToActuator.cpp 
    tuhopuu2/source/gameengine/Rasterizer/RAS_OpenGLRasterizer 
                                                               RAS_OpenGLRasterizer.cpp 
  Removed files:
    tuhopuu2/bin/.blender/locale/pt_BR/LC_MESSAGES blender.mo 
    tuhopuu2/doc         autoconfig.txt 
  
  Log:
  Post merge conflict resolution
  
  Revision  Changes    Path
  1.4       +2 -0      tuhopuu2/README
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu2/README.diff?r1=1.3&r2=1.4&cvsroot=tuhopuu>
  1.27      +113 -12   tuhopuu2/SConstruct
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu2/SConstruct.diff?r1=1.26&r2=1.27&cvsroot=tuhopuu>
  1.9       +3 -0      tuhopuu2/intern/SoundSystem/openal/SND_OpenALDevice.cpp
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu2/intern/SoundSystem/openal/SND_OpenALDevice.cpp.diff?r1=1.8&r2=1.9&cvsroot=tuhopuu>
  1.8       +31 -2     tuhopuu2/intern/ghost/intern/GHOST_WindowX11.cpp
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu2/intern/ghost/intern/GHOST_WindowX11.cpp.diff?r1=1.7&r2=1.8&cvsroot=tuhopuu>
  1.8       +15 -7     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.7&r2=1.8&cvsroot=tuhopuu>
  1.3       +186 -178  tuhopuu2/projectfiles/blender/loader/BLO_loader.dsp
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu2/projectfiles/blender/loader/BLO_loader.dsp.diff?r1=1.2&r2=1.3&cvsroot=tuhopuu>
  1.21      +2 -1      tuhopuu2/source/Makefile
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu2/source/Makefile.diff?r1=1.20&r2=1.21&cvsroot=tuhopuu>
  1.4       +1 -3      tuhopuu2/source/nan_warn.mk
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu2/source/nan_warn.mk.diff?r1=1.3&r2=1.4&cvsroot=tuhopuu>
  1.5       +6 -2      tuhopuu2/source/blender/blenkernel/BKE_constraint.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu2/source/blender/blenkernel/BKE_constraint.h.diff?r1=1.4&r2=1.5&cvsroot=tuhopuu>
  1.4       +1 -0      tuhopuu2/source/blender/blenkernel/BKE_displist.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu2/source/blender/blenkernel/BKE_displist.h.diff?r1=1.3&r2=1.4&cvsroot=tuhopuu>
  1.10      +4 -1      tuhopuu2/source/blender/blenkernel/BKE_global.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu2/source/blender/blenkernel/BKE_global.h.diff?r1=1.9&r2=1.10&cvsroot=tuhopuu>
  1.9       +69 -9     tuhopuu2/source/blender/blenkernel/intern/blender.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu2/source/blender/blenkernel/intern/blender.c.diff?r1=1.8&r2=1.9&cvsroot=tuhopuu>
  1.15      +144 -89   tuhopuu2/source/blender/blenkernel/intern/constraint.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu2/source/blender/blenkernel/intern/constraint.c.diff?r1=1.14&r2=1.15&cvsroot=tuhopuu>
  1.16      +61 -9     tuhopuu2/source/blender/blenkernel/intern/displist.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu2/source/blender/blenkernel/intern/displist.c.diff?r1=1.15&r2=1.16&cvsroot=tuhopuu>
  1.11      +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.10&r2=1.11&cvsroot=tuhopuu>
  1.14      +23 -8     tuhopuu2/source/blender/blenkernel/intern/object.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu2/source/blender/blenkernel/intern/object.c.diff?r1=1.13&r2=1.14&cvsroot=tuhopuu>
  1.7       +4 -74     tuhopuu2/source/blender/blenkernel/intern/scene.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu2/source/blender/blenkernel/intern/scene.c.diff?r1=1.6&r2=1.7&cvsroot=tuhopuu>
  1.4       +2 -2      tuhopuu2/source/blender/blenlib/intern/storage.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu2/source/blender/blenlib/intern/storage.c.diff?r1=1.3&r2=1.4&cvsroot=tuhopuu>
  1.5       +1 -0      tuhopuu2/source/blender/blenloader/SConscript
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu2/source/blender/blenloader/SConscript.diff?r1=1.4&r2=1.5&cvsroot=tuhopuu>
  1.20      +243 -59   tuhopuu2/source/blender/blenloader/intern/readfile.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu2/source/blender/blenloader/intern/readfile.c.diff?r1=1.19&r2=1.20&cvsroot=tuhopuu>
  1.13      +106 -42   tuhopuu2/source/blender/blenloader/intern/writefile.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu2/source/blender/blenloader/intern/writefile.c.diff?r1=1.12&r2=1.13&cvsroot=tuhopuu>
  1.4       +2 -1      tuhopuu2/source/blender/include/BDR_unwrapper.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu2/source/blender/include/BDR_unwrapper.h.diff?r1=1.3&r2=1.4&cvsroot=tuhopuu>
  1.8       +1 -2      tuhopuu2/source/blender/include/BIF_editconstraint.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu2/source/blender/include/BIF_editconstraint.h.diff?r1=1.7&r2=1.8&cvsroot=tuhopuu>
  1.29      +3 -0      tuhopuu2/source/blender/include/BIF_editmesh.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu2/source/blender/include/BIF_editmesh.h.diff?r1=1.28&r2=1.29&cvsroot=tuhopuu>
  1.14      +2 -1      tuhopuu2/source/blender/include/BIF_resources.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu2/source/blender/include/BIF_resources.h.diff?r1=1.13&r2=1.14&cvsroot=tuhopuu>
  1.26      +3 -3      tuhopuu2/source/blender/include/butspace.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu2/source/blender/include/butspace.h.diff?r1=1.25&r2=1.26&cvsroot=tuhopuu>
  1.8       +2 -1      tuhopuu2/source/blender/include/interface.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu2/source/blender/include/interface.h.diff?r1=1.7&r2=1.8&cvsroot=tuhopuu>
  1.9       +12 -34    tuhopuu2/source/blender/makesdna/DNA_constraint_types.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu2/source/blender/makesdna/DNA_constraint_types.h.diff?r1=1.8&r2=1.9&cvsroot=tuhopuu>
  1.4       +1 -1      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.3&r2=1.4&cvsroot=tuhopuu>
  1.8       +2 -2      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.7&r2=1.8&cvsroot=tuhopuu>
  1.10      +2 -1      tuhopuu2/source/blender/makesdna/DNA_space_types.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu2/source/blender/makesdna/DNA_space_types.h.diff?r1=1.9&r2=1.10&cvsroot=tuhopuu>
  1.16      +3 -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.15&r2=1.16&cvsroot=tuhopuu>
  1.9       +2 -1      tuhopuu2/source/blender/python/SConscript
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu2/source/blender/python/SConscript.diff?r1=1.8&r2=1.9&cvsroot=tuhopuu>
  1.4       +1 -1      tuhopuu2/source/blender/python/api2_2x/Object.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu2/source/blender/python/api2_2x/Object.c.diff?r1=1.3&r2=1.4&cvsroot=tuhopuu>
  1.4       +389 -13   tuhopuu2/source/blender/python/api2_2x/Texture.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu2/source/blender/python/api2_2x/Texture.c.diff?r1=1.3&r2=1.4&cvsroot=tuhopuu>
  1.15      +1 -1      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.14&r2=1.15&cvsroot=tuhopuu>
  1.33      +13 -10    tuhopuu2/source/blender/renderconverter/intern/convertBlenderScene.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu2/source/blender/renderconverter/intern/convertBlenderScene.c.diff?r1=1.32&r2=1.33&cvsroot=tuhopuu>
  1.39      +3 -5      tuhopuu2/source/blender/src/buttons_editing.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu2/source/blender/src/buttons_editing.c.diff?r1=1.38&r2=1.39&cvsroot=tuhopuu>
  1.24      +61 -15    tuhopuu2/source/blender/src/buttons_object.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu2/source/blender/src/buttons_object.c.diff?r1=1.23&r2=1.24&cvsroot=tuhopuu>
  1.27      +2 -2      tuhopuu2/source/blender/src/drawimage.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu2/source/blender/src/drawimage.c.diff?r1=1.26&r2=1.27&cvsroot=tuhopuu>
  1.48      +58 -22    tuhopuu2/source/blender/src/drawobject.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu2/source/blender/src/drawobject.c.diff?r1=1.47&r2=1.48&cvsroot=tuhopuu>
  1.22      +2 -2      tuhopuu2/source/blender/src/drawview.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu2/source/blender/src/drawview.c.diff?r1=1.21&r2=1.22&cvsroot=tuhopuu>
  1.11      +2 -1      tuhopuu2/source/blender/src/editaction.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu2/source/blender/src/editaction.c.diff?r1=1.10&r2=1.11&cvsroot=tuhopuu>
  1.17      +48 -4     tuhopuu2/source/blender/src/editconstraint.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu2/source/blender/src/editconstraint.c.diff?r1=1.16&r2=1.17&cvsroot=tuhopuu>
  1.4       +225 -65   tuhopuu2/source/blender/src/editcurve.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu2/source/blender/src/editcurve.c.diff?r1=1.3&r2=1.4&cvsroot=tuhopuu>
  1.27      +9 -17     tuhopuu2/source/blender/src/editface.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu2/source/blender/src/editface.c.diff?r1=1.26&r2=1.27&cvsroot=tuhopuu>
  1.14      +18 -9     tuhopuu2/source/blender/src/editipo.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu2/source/blender/src/editipo.c.diff?r1=1.13&r2=1.14&cvsroot=tuhopuu>
  1.3       +11 -3     tuhopuu2/source/blender/src/editkey.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu2/source/blender/src/editkey.c.diff?r1=1.2&r2=1.3&cvsroot=tuhopuu>
  1.111     +316 -9    tuhopuu2/source/blender/src/editmesh.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu2/source/blender/src/editmesh.c.diff?r1=1.110&r2=1.111&cvsroot=tuhopuu>
  1.65      +85 -24    tuhopuu2/source/blender/src/editobject.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu2/source/blender/src/editobject.c.diff?r1=1.64&r2=1.65&cvsroot=tuhopuu>
  1.18      +17 -8     tuhopuu2/source/blender/src/editscreen.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu2/source/blender/src/editscreen.c.diff?r1=1.17&r2=1.18&cvsroot=tuhopuu>
  1.30      +35 -2     tuhopuu2/source/blender/src/header_image.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu2/source/blender/src/header_image.c.diff?r1=1.29&r2=1.30&cvsroot=tuhopuu>
  1.11      +13 -1     tuhopuu2/source/blender/src/header_info.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu2/source/blender/src/header_info.c.diff?r1=1.10&r2=1.11&cvsroot=tuhopuu>
  1.30      +10 -4     tuhopuu2/source/blender/src/header_view3d.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu2/source/blender/src/header_view3d.c.diff?r1=1.29&r2=1.30&cvsroot=tuhopuu>
  1.24      +47 -57    tuhopuu2/source/blender/src/interface.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu2/source/blender/src/interface.c.diff?r1=1.23&r2=1.24&cvsroot=tuhopuu>
  1.7       +14 -40    tuhopuu2/source/blender/src/interface_draw.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu2/source/blender/src/interface_draw.c.diff?r1=1.6&r2=1.7&cvsroot=tuhopuu>
  1.4       +2 -1      tuhopuu2/source/blender/src/oops.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu2/source/blender/src/oops.c.diff?r1=1.3&r2=1.4&cvsroot=tuhopuu>
  1.12      +85 -53    tuhopuu2/source/blender/src/resources.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu2/source/blender/src/resources.c.diff?r1=1.11&r2=1.12&cvsroot=tuhopuu>
  1.78      +38 -12    tuhopuu2/source/blender/src/space.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu2/source/blender/src/space.c.diff?r1=1.77&r2=1.78&cvsroot=tuhopuu>
  1.10      +11 -1     tuhopuu2/source/blender/src/toets.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu2/source/blender/src/toets.c.diff?r1=1.9&r2=1.10&cvsroot=tuhopuu>
  1.18      +4 -2      tuhopuu2/source/blender/src/toolbox.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu2/source/blender/src/toolbox.c.diff?r1=1.17&r2=1.18&cvsroot=tuhopuu>
  1.14      +397 -150  tuhopuu2/source/blender/src/unwrapper.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu2/source/blender/src/unwrapper.c.diff?r1=1.13&r2=1.14&cvsroot=tuhopuu>
  1.18      +19 -3     tuhopuu2/source/blender/src/usiblender.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu2/source/blender/src/usiblender.c.diff?r1=1.17&r2=1.18&cvsroot=tuhopuu>
  1.8       +15 -8     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.7&r2=1.8&cvsroot=tuhopuu>
  1.4       +1 -2      tuhopuu2/source/gameengine/GamePlayer/common/GPC_Canvas.cpp
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu2/source/gameengine/GamePlayer/common/GPC_Canvas.cpp.diff?r1=1.3&r2=1.4&cvsroot=tuhopuu>
  1.15      +2 -2      tuhopuu2/source/gameengine/GamePlayer/ghost/GPG_Application.cpp
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu2/source/gameengine/GamePlayer/ghost/GPG_Application.cpp.diff?r1=1.14&r2=1.15&cvsroot=tuhopuu>
  1.13      +7 -1      tuhopuu2/source/gameengine/Ketsji/KX_RaySensor.cpp
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu2/source/gameengine/Ketsji/KX_RaySensor.cpp.diff?r1=1.12&r2=1.13&cvsroot=tuhopuu>
  1.4       +1 -0      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.3&r2=1.4&cvsroot=tuhopuu>
  1.7       +1 -0      tuhopuu2/source/gameengine/Ketsji/KX_SceneActuator.cpp
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu2/source/gameengine/Ketsji/KX_SceneActuator.cpp.diff?r1=1.6&r2=1.7&cvsroot=tuhopuu>
  1.4       +1 -0      tuhopuu2/source/gameengine/Ketsji/KX_TrackToActuator.cpp
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu2/source/gameengine/Ketsji/KX_TrackToActuator.cpp.diff?r1=1.3&r2=1.4&cvsroot=tuhopuu>
  1.37      +4 -1      tuhopuu2/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu2/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp.diff?r1=1.36&r2=1.37&cvsroot=tuhopuu>

More information about the tuhopuu-cvs mailing list