[Bf-blender-cvs] CVS commit: blender/bin/.blender/locale/sr/LC_MESSAGES blender.mo blender/bin/.blender/locale/uk/LC_MESSAGES blender.mo blender/po sr.po uk.po blender/release/scripts 3ds_export.py 3ds_import.py archimap.py blenderLipSynchro.py collada_export.py collada_import.py flt_export.py ...

Chris Want cwant at ualberta.ca
Sat Jan 28 17:35:18 CET 2006


hos (Chris Want) 2006/01/28 17:35:18 CET

  Modified files:        (Branch: orange)
    blender/source       Makefile nan_compile.mk 
                         nan_definitions.mk 
    blender/source/blender/blenkernel BKE_blender.h 
    blender/source/blender/blenkernel/intern armature.c 
                                             constraint.c 
                                             subsurf_ccg.c 
    blender/source/blender/python BPY_interface.c SConscript 
    blender/source/blender/python/api2_2x Armature.c Armature.h 
                                          BezTriple.c Bone.c 
                                          Bone.h Key.c Mesh.c 
                                          NLA.c NLA.h NMesh.c 
                                          Object.c Pose.c Pose.h 
                                          Window.c constant.c 
                                          matrix.c vector.c 
                                          windowTheme.c 
    blender/source/blender/python/api2_2x/doc API_intro.py 
                                              Armature.py Ipo.py 
                                              Key.py Mathutils.py 
                                              Mesh.py Object.py 
                                              Theme.py Window.py 
    blender/source/blender/src buttons_editing.c buttons_logic.c 
                               drawseq.c drawsound.c editoops.c 
                               filesel.c header_filesel.c 
                               header_imasel.c header_ipo.c 
                               header_oops.c header_script.c 
                               header_seq.c header_text.c 
                               header_view3d.c interface.c 
                               interface_draw.c renderwin.c 
                               space.c splash.jpg.c toolbox.c 
                               transform_generics.c view.c 
    blender/source/gameengine/BlenderRoutines 
                                              BL_KetsjiEmbedStart.cpp 
                                              KX_BlenderRenderTools.cpp 
    blender/source/gameengine/Converter BL_ActionActuator.cpp 
                                        BL_BlenderDataConversion.cpp 
    blender/source/gameengine/GamePlayer/common 
                                                GPC_PolygonMaterial.cpp 
                                                GPC_RenderTools.cpp 
    blender/source/gameengine/GamePlayer/ghost GPG_Application.cpp 
    blender/source/gameengine/GamePlayer/netscape/src UnixShell.c 
    blender/source/gameengine/Ketsji BL_Material.h BL_Shader.cpp 
                                     BL_Shader.h BL_Texture.cpp 
                                     KX_BlenderMaterial.cpp 
                                     KX_BlenderMaterial.h 
                                     KX_KetsjiEngine.cpp 
                                     KX_KetsjiEngine.h 
                                     KX_PyConstraintBinding.cpp 
                                     KX_PythonInit.cpp Makefile 
    blender/source/gameengine/Physics/Bullet 
                                             CcdPhysicsEnvironment.cpp 
                                             CcdPhysicsEnvironment.h 
    blender/source/gameengine/Physics/Dummy 
                                            DummyPhysicsEnvironment.cpp 
                                            DummyPhysicsEnvironment.h 
    blender/source/gameengine/Physics/Sumo 
                                           SumoPhysicsEnvironment.cpp 
                                           SumoPhysicsEnvironment.h 
    blender/source/gameengine/Physics/Sumo/Fuzzics/src 
                                                       SM_Scene.cpp 
    blender/source/gameengine/Physics/common 
                                             PHY_IPhysicsEnvironment.h 
    blender/source/gameengine/Rasterizer Makefile 
    blender/source/gameengine/Rasterizer/RAS_OpenGLRasterizer 
                                                              Makefile 
                                                              RAS_GLExtensionManager.cpp 
                                                              RAS_GLExtensionManager.h 
                                                              RAS_OpenGLRasterizer.cpp 
                                                              RAS_VAOpenGLRasterizer.cpp 
  Added files:           (Branch: orange)
    blender/bin/.blender/locale/sr/LC_MESSAGES blender.mo 
    blender/bin/.blender/locale/uk/LC_MESSAGES blender.mo 
    blender/po           sr.po uk.po 
    blender/release/scripts 3ds_export.py 3ds_import.py 
                            archimap.py blenderLipSynchro.py 
                            collada_export.py collada_import.py 
                            flt_export.py flt_filewalker.py 
                            flt_import.py image_edit.py 
                            md2_export.py md2_import.py 
                            mesh_bbrush_menu.py mesh_cleanup.py 
                            mesh_tri2quad.py 
                            mirror_bone_weights.py 
                            object_batch_name_edit.py 
                            ply_export.py ply_import.py 
                            widgetwizard.py xfig_export.py 
                            xsi_export.py 
    blender/release/scripts/bpydata mesh_bbrush.py 
    blender/release/scripts/bpymodules boxpack2d.py 
    blender/release/text BlenderQuickStart.pdf release_240.txt 
                         release_241.txt 
    blender/source/blender/python/api2_2x/doc Pose.py 
  
  Log:
  Final merge of HEAD (bf-blender) into the orange branch.
  
  Here are my notes on things to look out for as potential problem
  spots:
  
  source/blender/blenkernel/intern/displist.c:
  + is initfastshade(void) supposed to be empty? I had
  to make it empty to get the merged tree to compile.
  
  source/blender/python/api2_2x/Armature.c:
  + went with the version that had Armature_getLayers()
  
  source/blender/python/api2_2x/Object.c
  + went with the version of Object_getPose() from bf-blender.
  (#ifdef 0-ed the other version)
  
  source/blender/python/api2_2x/Pose.[ch]
  + had problems linking due to no Pose_Init() ... copied these
  two files straight from bf-blender.
  
  source/blender/src/drawview.c:
  + view3d_panel_properties() had things shifted a few things shifted
  a few pixels, otherwise, things were painless
  
  source/blender/src/splash.jpg.c:
  + went with bf-blender version (orange is dead)
  
  source/gameengine:
  + went with bf-blender version -- does not compile due to IMB_rect* stuff,
  Ton should look into this.
  
  Revision  Changes    Path
  1.93.2.5  +22 -26    blender/source/Makefile
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/Makefile.diff?r1=1.93.2.4&r2=1.93.2.5&cvsroot=bf-blender>
  1.23.2.2  +1 -1      blender/source/nan_compile.mk
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/nan_compile.mk.diff?r1=1.23.2.1&r2=1.23.2.2&cvsroot=bf-blender>
  1.79.2.5  +4 -4      blender/source/nan_definitions.mk
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/nan_definitions.mk.diff?r1=1.79.2.4&r2=1.79.2.5&cvsroot=bf-blender>
  1.22.2.2  +2 -2      blender/source/blender/blenkernel/BKE_blender.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/blenkernel/BKE_blender.h.diff?r1=1.22.2.1&r2=1.22.2.2&cvsroot=bf-blender>
  1.64.2.3  +15 -0     blender/source/blender/blenkernel/intern/armature.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/blenkernel/intern/armature.c.diff?r1=1.64.2.2&r2=1.64.2.3&cvsroot=bf-blender>
  1.42.2.2  +3 -0      blender/source/blender/blenkernel/intern/constraint.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/blenkernel/intern/constraint.c.diff?r1=1.42.2.1&r2=1.42.2.2&cvsroot=bf-blender>
  1.64.2.2  +5 -2      blender/source/blender/blenkernel/intern/subsurf_ccg.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/blenkernel/intern/subsurf_ccg.c.diff?r1=1.64.2.1&r2=1.64.2.2&cvsroot=bf-blender>
  1.78.2.2  +3 -2      blender/source/blender/python/BPY_interface.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/python/BPY_interface.c.diff?r1=1.78.2.1&r2=1.78.2.2&cvsroot=bf-blender>
  1.30.2.2  +1 -0      blender/source/blender/python/SConscript
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/python/SConscript.diff?r1=1.30.2.1&r2=1.30.2.2&cvsroot=bf-blender>
  1.28.2.7  +18 -9     blender/source/blender/python/api2_2x/Armature.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/python/api2_2x/Armature.c.diff?r1=1.28.2.6&r2=1.28.2.7&cvsroot=bf-blender>
  1.12.2.2  +3 -3      blender/source/blender/python/api2_2x/Armature.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/python/api2_2x/Armature.h.diff?r1=1.12.2.1&r2=1.12.2.2&cvsroot=bf-blender>
  1.16.2.4  +7 -27     blender/source/blender/python/api2_2x/BezTriple.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/python/api2_2x/BezTriple.c.diff?r1=1.16.2.3&r2=1.16.2.4&cvsroot=bf-blender>
  1.37.2.3  +109 -37   blender/source/blender/python/api2_2x/Bone.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/python/api2_2x/Bone.c.diff?r1=1.37.2.2&r2=1.37.2.3&cvsroot=bf-blender>
  1.8.2.4   +3 -3      blender/source/blender/python/api2_2x/Bone.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/python/api2_2x/Bone.h.diff?r1=1.8.2.3&r2=1.8.2.4&cvsroot=bf-blender>
  1.6.2.2   +84 -59    blender/source/blender/python/api2_2x/Key.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/python/api2_2x/Key.c.diff?r1=1.6.2.1&r2=1.6.2.2&cvsroot=bf-blender>
  1.19.2.5  +349 -131  blender/source/blender/python/api2_2x/Mesh.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/python/api2_2x/Mesh.c.diff?r1=1.19.2.4&r2=1.19.2.5&cvsroot=bf-blender>
  1.9.2.2   +7 -3      blender/source/blender/python/api2_2x/NLA.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/python/api2_2x/NLA.c.diff?r1=1.9.2.1&r2=1.9.2.2&cvsroot=bf-blender>
  1.3.2.1   +3 -1      blender/source/blender/python/api2_2x/NLA.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/python/api2_2x/NLA.h.diff?r1=1.3.2.0&r2=1.3.2.1&cvsroot=bf-blender>
  1.105.2.4 +33 -49    blender/source/blender/python/api2_2x/NMesh.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/python/api2_2x/NMesh.c.diff?r1=1.105.2.3&r2=1.105.2.4&cvsroot=bf-blender>
  1.146.2.8 +35 -7     blender/source/blender/python/api2_2x/Object.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/python/api2_2x/Object.c.diff?r1=1.146.2.7&r2=1.146.2.8&cvsroot=bf-blender>
  1.1.2.2   +920 -123  blender/source/blender/python/api2_2x/Pose.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/python/api2_2x/Pose.c.diff?r1=1.1.2.1&r2=1.1.2.2&cvsroot=bf-blender>
  1.1.2.2   +59 -15    blender/source/blender/python/api2_2x/Pose.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/python/api2_2x/Pose.h.diff?r1=1.1.2.1&r2=1.1.2.2&cvsroot=bf-blender>
  1.38.2.1  +10 -7     blender/source/blender/python/api2_2x/Window.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/python/api2_2x/Window.c.diff?r1=1.38.2.0&r2=1.38.2.1&cvsroot=bf-blender>
  1.17.2.2  +2 -2      blender/source/blender/python/api2_2x/constant.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/python/api2_2x/constant.c.diff?r1=1.17.2.1&r2=1.17.2.2&cvsroot=bf-blender>
  1.29.2.3  +2 -2      blender/source/blender/python/api2_2x/matrix.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/python/api2_2x/matrix.c.diff?r1=1.29.2.2&r2=1.29.2.3&cvsroot=bf-blender>
  1.34.2.2  +3 -3      blender/source/blender/python/api2_2x/vector.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/python/api2_2x/vector.c.diff?r1=1.34.2.1&r2=1.34.2.2&cvsroot=bf-blender>
  1.10.2.1  +12 -3     blender/source/blender/python/api2_2x/windowTheme.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/python/api2_2x/windowTheme.c.diff?r1=1.10.2.0&r2=1.10.2.1&cvsroot=bf-blender>
  1.25.2.3  +1 -0      blender/source/blender/python/api2_2x/doc/API_intro.py
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/python/api2_2x/doc/API_intro.py.diff?r1=1.25.2.2&r2=1.25.2.3&cvsroot=bf-blender>
  1.13.2.2  +9 -2      blender/source/blender/python/api2_2x/doc/Armature.py
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/python/api2_2x/doc/Armature.py.diff?r1=1.13.2.1&r2=1.13.2.2&cvsroot=bf-blender>
  1.30.2.4  +10 -0     blender/source/blender/python/api2_2x/doc/Ipo.py
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/python/api2_2x/doc/Ipo.py.diff?r1=1.30.2.3&r2=1.30.2.4&cvsroot=bf-blender>
  1.5.2.2   +6 -3      blender/source/blender/python/api2_2x/doc/Key.py
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/python/api2_2x/doc/Key.py.diff?r1=1.5.2.1&r2=1.5.2.2&cvsroot=bf-blender>
  1.8.2.3   +1 -0      blender/source/blender/python/api2_2x/doc/Mathutils.py
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/python/api2_2x/doc/Mathutils.py.diff?r1=1.8.2.2&r2=1.8.2.3&cvsroot=bf-blender>
  1.10.2.2  +44 -13    blender/source/blender/python/api2_2x/doc/Mesh.py
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/python/api2_2x/doc/Mesh.py.diff?r1=1.10.2.1&r2=1.10.2.2&cvsroot=bf-blender>
  1.48.2.4  +13 -0     blender/source/blender/python/api2_2x/doc/Object.py
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/python/api2_2x/doc/Object.py.diff?r1=1.48.2.3&r2=1.48.2.4&cvsroot=bf-blender>
  1.7.2.1   +4 -0      blender/source/blender/python/api2_2x/doc/Theme.py
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/python/api2_2x/doc/Theme.py.diff?r1=1.7.2.0&r2=1.7.2.1&cvsroot=bf-blender>
  1.19.2.2  +4 -1      blender/source/blender/python/api2_2x/doc/Window.py
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/python/api2_2x/doc/Window.py.diff?r1=1.19.2.1&r2=1.19.2.2&cvsroot=bf-blender>
  1.235.2.17 +1 -1      blender/source/blender/src/buttons_editing.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/src/buttons_editing.c.diff?r1=1.235.2.16&r2=1.235.2.17&cvsroot=bf-blender>
  1.30.2.3  +1 -1      blender/source/blender/src/buttons_logic.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/src/buttons_logic.c.diff?r1=1.30.2.2&r2=1.30.2.3&cvsroot=bf-blender>
  1.38.2.4  +22 -4     blender/source/blender/src/drawseq.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/src/drawseq.c.diff?r1=1.38.2.3&r2=1.38.2.4&cvsroot=bf-blender>
  1.15.2.1  +2 -3      blender/source/blender/src/drawsound.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/src/drawsound.c.diff?r1=1.15.2.0&r2=1.15.2.1&cvsroot=bf-blender>
  1.18.2.3  +3 -2      blender/source/blender/src/editoops.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/src/editoops.c.diff?r1=1.18.2.2&r2=1.18.2.3&cvsroot=bf-blender>
  1.68.2.8  +11 -4     blender/source/blender/src/filesel.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/src/filesel.c.diff?r1=1.68.2.7&r2=1.68.2.8&cvsroot=bf-blender>
  1.22.2.2  +4 -2      blender/source/blender/src/header_filesel.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/src/header_filesel.c.diff?r1=1.22.2.1&r2=1.22.2.2&cvsroot=bf-blender>
  1.9.2.1   +4 -1      blender/source/blender/src/header_imasel.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/src/header_imasel.c.diff?r1=1.9.2.0&r2=1.9.2.1&cvsroot=bf-blender>
  1.37.2.4  +7 -2      blender/source/blender/src/header_ipo.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/src/header_ipo.c.diff?r1=1.37.2.3&r2=1.37.2.4&cvsroot=bf-blender>
  1.22.2.3  +47 -25    blender/source/blender/src/header_oops.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/src/header_oops.c.diff?r1=1.22.2.2&r2=1.22.2.3&cvsroot=bf-blender>
  1.16.2.2  +4 -2      blender/source/blender/src/header_script.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/src/header_script.c.diff?r1=1.16.2.1&r2=1.16.2.2&cvsroot=bf-blender>
  1.24.2.1  +3 -1      blender/source/blender/src/header_seq.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/src/header_seq.c.diff?r1=1.24.2.0&r2=1.24.2.1&cvsroot=bf-blender>
  1.28.2.2  +3 -1      blender/source/blender/src/header_text.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/src/header_text.c.diff?r1=1.28.2.1&r2=1.28.2.2&cvsroot=bf-blender>
  1.143.2.8 +3 -1      blender/source/blender/src/header_view3d.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/src/header_view3d.c.diff?r1=1.143.2.7&r2=1.143.2.8&cvsroot=bf-blender>
  1.217.2.19 +2 -2      blender/source/blender/src/interface.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/src/interface.c.diff?r1=1.217.2.18&r2=1.217.2.19&cvsroot=bf-blender>
  1.48.2.8  +38 -14    blender/source/blender/src/interface_draw.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/src/interface_draw.c.diff?r1=1.48.2.7&r2=1.48.2.8&cvsroot=bf-blender>
  1.59.2.14 +10 -3     blender/source/blender/src/renderwin.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/src/renderwin.c.diff?r1=1.59.2.13&r2=1.59.2.14&cvsroot=bf-blender>
  1.317.2.21 +24 -6     blender/source/blender/src/space.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/src/space.c.diff?r1=1.317.2.20&r2=1.317.2.21&cvsroot=bf-blender>
  1.23.2.2  +2392 -1351blender/source/blender/src/splash.jpg.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/src/splash.jpg.c.diff?r1=1.23.2.1&r2=1.23.2.2&cvsroot=bf-blender>
  1.117.2.9 +27 -1     blender/source/blender/src/toolbox.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/src/toolbox.c.diff?r1=1.117.2.8&r2=1.117.2.9&cvsroot=bf-blender>
  1.78.2.5  +5 -2      blender/source/blender/src/transform_generics.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/src/transform_generics.c.diff?r1=1.78.2.4&r2=1.78.2.5&cvsroot=bf-blender>
  1.59.2.7  +7 -0      blender/source/blender/src/view.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/src/view.c.diff?r1=1.59.2.6&r2=1.59.2.7&cvsroot=bf-blender>
  1.8.2.2   +5 -1      blender/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp.diff?r1=1.8.2.1&r2=1.8.2.2&cvsroot=bf-blender>
  1.15.2.2  +2 -1      blender/source/gameengine/BlenderRoutines/KX_BlenderRenderTools.cpp
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/gameengine/BlenderRoutines/KX_BlenderRenderTools.cpp.diff?r1=1.15.2.1&r2=1.15.2.2&cvsroot=bf-blender>
  1.13.2.2  +4 -4      blender/source/gameengine/Converter/BL_ActionActuator.cpp
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/gameengine/Converter/BL_ActionActuator.cpp.diff?r1=1.13.2.1&r2=1.13.2.2&cvsroot=bf-blender>
  1.31.2.4  +9 -6      blender/source/gameengine/Converter/BL_BlenderDataConversion.cpp
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/gameengine/Converter/BL_BlenderDataConversion.cpp.diff?r1=1.31.2.3&r2=1.31.2.4&cvsroot=bf-blender>
  1.11.2.1  +2 -1      blender/source/gameengine/GamePlayer/common/GPC_PolygonMaterial.cpp
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/gameengine/GamePlayer/common/GPC_PolygonMaterial.cpp.diff?r1=1.11.2.0&r2=1.11.2.1&cvsroot=bf-blender>
  1.14.2.1  +2 -1      blender/source/gameengine/GamePlayer/common/GPC_RenderTools.cpp
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/gameengine/GamePlayer/common/GPC_RenderTools.cpp.diff?r1=1.14.2.0&r2=1.14.2.1&cvsroot=bf-blender>
  1.15.2.2  +2 -1      blender/source/gameengine/GamePlayer/ghost/GPG_Application.cpp
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/gameengine/GamePlayer/ghost/GPG_Application.cpp.diff?r1=1.15.2.1&r2=1.15.2.2&cvsroot=bf-blender>
  1.4.2.1   +3 -3      blender/source/gameengine/GamePlayer/netscape/src/UnixShell.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/gameengine/GamePlayer/netscape/src/UnixShell.c.diff?r1=1.4.2.0&r2=1.4.2.1&cvsroot=bf-blender>
  1.2.2.2   +2 -1      blender/source/gameengine/Ketsji/BL_Material.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/gameengine/Ketsji/BL_Material.h.diff?r1=1.2.2.1&r2=1.2.2.2&cvsroot=bf-blender>
  1.2.2.2   +218 -170  blender/source/gameengine/Ketsji/BL_Shader.cpp
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/gameengine/Ketsji/BL_Shader.cpp.diff?r1=1.2.2.1&r2=1.2.2.2&cvsroot=bf-blender>
  1.2.2.2   +6 -19     blender/source/gameengine/Ketsji/BL_Shader.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/gameengine/Ketsji/BL_Shader.h.diff?r1=1.2.2.1&r2=1.2.2.2&cvsroot=bf-blender>
  1.1.2.3   +14 -13    blender/source/gameengine/Ketsji/BL_Texture.cpp
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/gameengine/Ketsji/BL_Texture.cpp.diff?r1=1.1.2.2&r2=1.1.2.3&cvsroot=bf-blender>
  1.5.2.2   +190 -84   blender/source/gameengine/Ketsji/KX_BlenderMaterial.cpp
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/gameengine/Ketsji/KX_BlenderMaterial.cpp.diff?r1=1.5.2.1&r2=1.5.2.2&cvsroot=bf-blender>
  1.2.2.2   +5 -1      blender/source/gameengine/Ketsji/KX_BlenderMaterial.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/gameengine/Ketsji/KX_BlenderMaterial.h.diff?r1=1.2.2.1&r2=1.2.2.2&cvsroot=bf-blender>
  1.21.2.4  +88 -70    blender/source/gameengine/Ketsji/KX_KetsjiEngine.cpp
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/gameengine/Ketsji/KX_KetsjiEngine.cpp.diff?r1=1.21.2.3&r2=1.21.2.4&cvsroot=bf-blender>
  1.11.2.3  +5 -3      blender/source/gameengine/Ketsji/KX_KetsjiEngine.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/gameengine/Ketsji/KX_KetsjiEngine.h.diff?r1=1.11.2.2&r2=1.11.2.3&cvsroot=bf-blender>
  1.9.2.2   +2 -2      blender/source/gameengine/Ketsji/KX_PyConstraintBinding.cpp
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/gameengine/Ketsji/KX_PyConstraintBinding.cpp.diff?r1=1.9.2.1&r2=1.9.2.2&cvsroot=bf-blender>
  1.15.2.2  +76 -27    blender/source/gameengine/Ketsji/KX_PythonInit.cpp
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/gameengine/Ketsji/KX_PythonInit.cpp.diff?r1=1.15.2.1&r2=1.15.2.2&cvsroot=bf-blender>
  1.13.2.2  +2 -1      blender/source/gameengine/Ketsji/Makefile
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/gameengine/Ketsji/Makefile.diff?r1=1.13.2.1&r2=1.13.2.2&cvsroot=bf-blender>
  1.12.2.3  +37 -17    blender/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp.diff?r1=1.12.2.2&r2=1.12.2.3&cvsroot=bf-blender>
  1.4.2.3   +3 -1      blender/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.h.diff?r1=1.4.2.2&r2=1.4.2.3&cvsroot=bf-blender>
  1.8.2.2   +2 -2      blender/source/gameengine/Physics/Dummy/DummyPhysicsEnvironment.cpp
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/gameengine/Physics/Dummy/DummyPhysicsEnvironment.cpp.diff?r1=1.8.2.1&r2=1.8.2.2&cvsroot=bf-blender>
  1.8.2.2   +2 -2      blender/source/gameengine/Physics/Dummy/DummyPhysicsEnvironment.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/gameengine/Physics/Dummy/DummyPhysicsEnvironment.h.diff?r1=1.8.2.1&r2=1.8.2.2&cvsroot=bf-blender>
  1.13.2.2  +2 -2      blender/source/gameengine/Physics/Sumo/SumoPhysicsEnvironment.cpp
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/gameengine/Physics/Sumo/SumoPhysicsEnvironment.cpp.diff?r1=1.13.2.1&r2=1.13.2.2&cvsroot=bf-blender>
  1.12.2.2  +2 -2      blender/source/gameengine/Physics/Sumo/SumoPhysicsEnvironment.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/gameengine/Physics/Sumo/SumoPhysicsEnvironment.h.diff?r1=1.12.2.1&r2=1.12.2.2&cvsroot=bf-blender>
  1.14.2.1  +7 -3      blender/source/gameengine/Physics/Sumo/Fuzzics/src/SM_Scene.cpp
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/gameengine/Physics/Sumo/Fuzzics/src/SM_Scene.cpp.diff?r1=1.14.2.0&r2=1.14.2.1&cvsroot=bf-blender>
  1.11.2.2  +2 -2      blender/source/gameengine/Physics/common/PHY_IPhysicsEnvironment.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/gameengine/Physics/common/PHY_IPhysicsEnvironment.h.diff?r1=1.11.2.1&r2=1.11.2.2&cvsroot=bf-blender>
  1.5.2.1   +4 -2      blender/source/gameengine/Rasterizer/Makefile
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/gameengine/Rasterizer/Makefile.diff?r1=1.5.2.0&r2=1.5.2.1&cvsroot=bf-blender>
  1.3.2.1   +4 -2      blender/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/Makefile
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/Makefile.diff?r1=1.3.2.0&r2=1.3.2.1&cvsroot=bf-blender>
  1.8.2.2   +159 -159  blender/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_GLExtensionManager.cpp
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_GLExtensionManager.cpp.diff?r1=1.8.2.1&r2=1.8.2.2&cvsroot=bf-blender>
  1.5.2.2   +81 -79    blender/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_GLExtensionManager.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_GLExtensionManager.h.diff?r1=1.5.2.1&r2=1.5.2.2&cvsroot=bf-blender>
  1.18.2.2  +58 -57    blender/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp.diff?r1=1.18.2.1&r2=1.18.2.2&cvsroot=bf-blender>
  1.12.2.1  +2 -1      blender/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_VAOpenGLRasterizer.cpp
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_VAOpenGLRasterizer.cpp.diff?r1=1.12.2.0&r2=1.12.2.1&cvsroot=bf-blender>



More information about the Bf-blender-cvs mailing list