[Bf-blender-cvs] CVS commit: blender/source/blender/blenkernel/intern DerivedMesh.c modifier.c blender/source/blender/include BIF_editaction.h BIF_editconstraint.h BIF_resources.h blender/source/blender/python/api2_2x Object.c blender/source/blender/render/intern/source imagetexture.c rendercore.c ...

[Ton Roosendaal]

ton (Ton Roosendaal) 2005/12/19 19:56:09 CET

  Modified files:        (Branch: orange)
    blender/source/blender/blenkernel/intern DerivedMesh.c 
                                             modifier.c 
    blender/source/blender/include BIF_editaction.h 
                                   BIF_editconstraint.h 
                                   BIF_resources.h 
    blender/source/blender/python/api2_2x Object.c 
    blender/source/blender/render/intern/source imagetexture.c 
                                                rendercore.c 
                                                texture.c 
    blender/source/blender/src blenderbuttons.c drawobject.c 
                               editaction.c editconstraint.c 
                               editdeform.c editipo_mods.c 
                               editmesh.c editmesh_tools.c 
                               fluidsim.c header_action.c 
                               header_filesel.c header_info.c 
                               header_nla.c header_view3d.c 
                               outliner.c transform.c 
                               transform_conversions.c 
                               transform_generics.c 
                               transform_manipulator.c 
    blender/source/gameengine/Ketsji KX_IpoActuator.cpp 
                                     KX_KetsjiEngine.cpp 
                                     KX_KetsjiEngine.h 
                                     KX_Scene.cpp KX_Scene.h 
  
  Log:
  Orange: monday merger with bf-blender (loadsa bugfixes).
  
  ALso: a bit tidying up in editaction.c and python Object.c
  
  Revision  Changes    Path
  1.103.2.3 +2 -2      blender/source/blender/blenkernel/intern/DerivedMesh.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/blenkernel/intern/DerivedMesh.c.diff?r1=1.103.2.2&r2=1.103.2.3&cvsroot=bf-blender>
  1.49.2.3  +8 -3      blender/source/blender/blenkernel/intern/modifier.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/blenkernel/intern/modifier.c.diff?r1=1.49.2.2&r2=1.49.2.3&cvsroot=bf-blender>
  1.9.2.1   +5 -1      blender/source/blender/include/BIF_editaction.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/include/BIF_editaction.h.diff?r1=1.9.2.0&r2=1.9.2.1&cvsroot=bf-blender>
  1.13.2.1  +2 -1      blender/source/blender/include/BIF_editconstraint.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/include/BIF_editconstraint.h.diff?r1=1.13.2.0&r2=1.13.2.1&cvsroot=bf-blender>
  1.48.2.3  +2 -2      blender/source/blender/include/BIF_resources.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/include/BIF_resources.h.diff?r1=1.48.2.2&r2=1.48.2.3&cvsroot=bf-blender>
  1.146.2.5 +11 -5     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.4&r2=1.146.2.5&cvsroot=bf-blender>
  1.5.2.2   +34 -17    blender/source/blender/render/intern/source/imagetexture.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/render/intern/source/imagetexture.c.diff?r1=1.5.2.1&r2=1.5.2.2&cvsroot=bf-blender>
  1.126.2.16 +4 -4      blender/source/blender/render/intern/source/rendercore.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/render/intern/source/rendercore.c.diff?r1=1.126.2.15&r2=1.126.2.16&cvsroot=bf-blender>
  1.53.2.5  +5 -32     blender/source/blender/render/intern/source/texture.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/render/intern/source/texture.c.diff?r1=1.53.2.4&r2=1.53.2.5&cvsroot=bf-blender>
  1.32.2.3  +1547 -1478blender/source/blender/src/blenderbuttons.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/src/blenderbuttons.c.diff?r1=1.32.2.2&r2=1.32.2.3&cvsroot=bf-blender>
  1.254.2.8 +35 -29    blender/source/blender/src/drawobject.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/src/drawobject.c.diff?r1=1.254.2.7&r2=1.254.2.8&cvsroot=bf-blender>
  1.70.2.6  +3 -16     blender/source/blender/src/editaction.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/src/editaction.c.diff?r1=1.70.2.5&r2=1.70.2.6&cvsroot=bf-blender>
  1.32.2.3  +29 -9     blender/source/blender/src/editconstraint.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/src/editconstraint.c.diff?r1=1.32.2.2&r2=1.32.2.3&cvsroot=bf-blender>
  1.25.2.1  +2 -33     blender/source/blender/src/editdeform.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/src/editdeform.c.diff?r1=1.25.2.0&r2=1.25.2.1&cvsroot=bf-blender>
  1.4.2.1   +3 -1      blender/source/blender/src/editipo_mods.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/src/editipo_mods.c.diff?r1=1.4.2.0&r2=1.4.2.1&cvsroot=bf-blender>
  1.164.2.3 +2 -2      blender/source/blender/src/editmesh.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/src/editmesh.c.diff?r1=1.164.2.2&r2=1.164.2.3&cvsroot=bf-blender>
  1.131.2.2 +1 -1      blender/source/blender/src/editmesh_tools.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/src/editmesh_tools.c.diff?r1=1.131.2.1&r2=1.131.2.2&cvsroot=bf-blender>
  1.11.2.4  +10 -6     blender/source/blender/src/fluidsim.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/src/fluidsim.c.diff?r1=1.11.2.3&r2=1.11.2.4&cvsroot=bf-blender>
  1.38.2.1  +72 -3     blender/source/blender/src/header_action.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/src/header_action.c.diff?r1=1.38.2.0&r2=1.38.2.1&cvsroot=bf-blender>
  1.22.2.1  +2 -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.0&r2=1.22.2.1&cvsroot=bf-blender>
  1.74.2.2  +2 -8      blender/source/blender/src/header_info.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/src/header_info.c.diff?r1=1.74.2.1&r2=1.74.2.2&cvsroot=bf-blender>
  1.21.2.1  +5 -5      blender/source/blender/src/header_nla.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/src/header_nla.c.diff?r1=1.21.2.0&r2=1.21.2.1&cvsroot=bf-blender>
  1.143.2.4 +74 -15    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.3&r2=1.143.2.4&cvsroot=bf-blender>
  1.58.2.7  +0 -1      blender/source/blender/src/outliner.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/src/outliner.c.diff?r1=1.58.2.6&r2=1.58.2.7&cvsroot=bf-blender>
  1.129.2.1 +7 -3      blender/source/blender/src/transform.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/src/transform.c.diff?r1=1.129.2.0&r2=1.129.2.1&cvsroot=bf-blender>
  1.70.2.5  +2 -1      blender/source/blender/src/transform_conversions.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/src/transform_conversions.c.diff?r1=1.70.2.4&r2=1.70.2.5&cvsroot=bf-blender>
  1.78.2.4  +9 -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.3&r2=1.78.2.4&cvsroot=bf-blender>
  1.53.2.3  +15 -8     blender/source/blender/src/transform_manipulator.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/src/transform_manipulator.c.diff?r1=1.53.2.2&r2=1.53.2.3&cvsroot=bf-blender>
  1.14.2.1  +13 -5     blender/source/gameengine/Ketsji/KX_IpoActuator.cpp
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/gameengine/Ketsji/KX_IpoActuator.cpp.diff?r1=1.14.2.0&r2=1.14.2.1&cvsroot=bf-blender>
  1.21.2.1  +30 -1     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.0&r2=1.21.2.1&cvsroot=bf-blender>
  1.11.2.1  +11 -2     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.0&r2=1.11.2.1&cvsroot=bf-blender>
  1.20.2.1  +20 -2     blender/source/gameengine/Ketsji/KX_Scene.cpp
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/gameengine/Ketsji/KX_Scene.cpp.diff?r1=1.20.2.0&r2=1.20.2.1&cvsroot=bf-blender>
  1.13.2.1  +23 -1     blender/source/gameengine/Ketsji/KX_Scene.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/gameengine/Ketsji/KX_Scene.h.diff?r1=1.13.2.0&r2=1.13.2.1&cvsroot=bf-blender>