[Bf-blender-cvs] CVS commit: blender/source/blender/blenkernel BKE_blender.h blender/source/blender/blenkernel/intern depsgraph.c modifier.c blender/source/blender/blenloader/intern readfile.c blender/source/blender/imbuf/intern tiff.c blender/source/blender/include BDR_editcurve.h BDR_editobject.h ...
Ton Roosendaal
ton at blender.org
Tue Jan 3 22:43:31 CET 2006
ton (Ton Roosendaal) 2006/01/03 22:43:31 CET
Modified files: (Branch: orange)
blender/source/blender/blenkernel BKE_blender.h
blender/source/blender/blenkernel/intern depsgraph.c
modifier.c
blender/source/blender/blenloader/intern readfile.c
blender/source/blender/imbuf/intern tiff.c
blender/source/blender/include BDR_editcurve.h
BDR_editobject.h
BIF_editarmature.h
BIF_meshtools.h BIF_space.h
blender/source/blender/python/api2_2x Armature.c BezTriple.c
Lamp.c Material.c Mesh.c
NMesh.c Object.c Scene.c
gen_utils.c
blender/source/blender/python/api2_2x/doc Ipo.py Lamp.py
Mesh.py Object.py
blender/source/blender/render/intern/source envmap.c
imagetexture.c
texture.c
blender/source/blender/src booleanops.c buttons_editing.c
buttons_shading.c drawipo.c
drawobject.c drawoops.c edit.c
editarmature.c editcurve.c
editmesh.c editmesh_mods.c
editmesh_tools.c editobject.c
editoops.c header_ipo.c
header_view3d.c meshtools.c
renderwin.c space.c
blender/source/gameengine/Converter
BL_BlenderDataConversion.cpp
BL_MeshDeformer.h
BL_SkinDeformer.cpp
BL_SkinDeformer.h
blender/source/gameengine/Expressions PyObjectPlus.cpp
PyObjectPlus.h Value.cpp
blender/source/gameengine/Ketsji
KX_BulletPhysicsController.cpp
KX_ConvertPhysicsObjects.cpp
KX_EmptyObject.cpp
KX_EmptyObject.h
KX_KetsjiEngine.cpp
KX_Scene.cpp
blender/source/gameengine/Physics/Bullet
CcdPhysicsController.cpp
CcdPhysicsController.h
CcdPhysicsEnvironment.cpp
CcdPhysicsEnvironment.h
Log:
Orange; merger with bf-blender.
(Merging is *not* fun work, especially not with bugfixes in main branch
for code that got cleaned up in the other! Poor Hos... :)
Revision Changes Path
1.22.2.1 +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.0&r2=1.22.2.1&cvsroot=bf-blender>
1.36.2.9 +10 -2 blender/source/blender/blenkernel/intern/depsgraph.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/blenkernel/intern/depsgraph.c.diff?r1=1.36.2.8&r2=1.36.2.9&cvsroot=bf-blender>
1.49.2.4 +8 -2 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.3&r2=1.49.2.4&cvsroot=bf-blender>
1.214.2.29 +5 -10 blender/source/blender/blenloader/intern/readfile.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/blenloader/intern/readfile.c.diff?r1=1.214.2.28&r2=1.214.2.29&cvsroot=bf-blender>
1.1.2.2 +6 -2 blender/source/blender/imbuf/intern/tiff.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/imbuf/intern/tiff.c.diff?r1=1.1.2.1&r2=1.1.2.2&cvsroot=bf-blender>
1.12.2.1 +2 -2 blender/source/blender/include/BDR_editcurve.h
<http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/include/BDR_editcurve.h.diff?r1=1.12.2.0&r2=1.12.2.1&cvsroot=bf-blender>
1.22.2.1 +2 -2 blender/source/blender/include/BDR_editobject.h
<http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/include/BDR_editobject.h.diff?r1=1.22.2.0&r2=1.22.2.1&cvsroot=bf-blender>
1.27.2.2 +2 -2 blender/source/blender/include/BIF_editarmature.h
<http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/include/BIF_editarmature.h.diff?r1=1.27.2.1&r2=1.27.2.2&cvsroot=bf-blender>
1.5.2.2 +1 -1 blender/source/blender/include/BIF_meshtools.h
<http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/include/BIF_meshtools.h.diff?r1=1.5.2.1&r2=1.5.2.2&cvsroot=bf-blender>
1.34.2.2 +2 -1 blender/source/blender/include/BIF_space.h
<http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/include/BIF_space.h.diff?r1=1.34.2.1&r2=1.34.2.2&cvsroot=bf-blender>
1.28.2.5 +8 -11 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.4&r2=1.28.2.5&cvsroot=bf-blender>
1.16.2.3 +34 -22 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.2&r2=1.16.2.3&cvsroot=bf-blender>
1.40.2.2 +13 -8 blender/source/blender/python/api2_2x/Lamp.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/python/api2_2x/Lamp.c.diff?r1=1.40.2.1&r2=1.40.2.2&cvsroot=bf-blender>
1.43.2.3 +9 -4 blender/source/blender/python/api2_2x/Material.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/python/api2_2x/Material.c.diff?r1=1.43.2.2&r2=1.43.2.3&cvsroot=bf-blender>
1.19.2.4 +66 -6 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.3&r2=1.19.2.4&cvsroot=bf-blender>
1.105.2.3 +85 -23 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.2&r2=1.105.2.3&cvsroot=bf-blender>
1.146.2.6 +192 -12 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.5&r2=1.146.2.6&cvsroot=bf-blender>
1.36.2.1 +29 -32 blender/source/blender/python/api2_2x/Scene.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/python/api2_2x/Scene.c.diff?r1=1.36.2.0&r2=1.36.2.1&cvsroot=bf-blender>
1.38.2.3 +9 -7 blender/source/blender/python/api2_2x/gen_utils.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/python/api2_2x/gen_utils.c.diff?r1=1.38.2.2&r2=1.38.2.3&cvsroot=bf-blender>
1.30.2.3 +11 -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.2&r2=1.30.2.3&cvsroot=bf-blender>
1.12.2.2 +3 -1 blender/source/blender/python/api2_2x/doc/Lamp.py
<http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/python/api2_2x/doc/Lamp.py.diff?r1=1.12.2.1&r2=1.12.2.2&cvsroot=bf-blender>
1.10.2.1 +6 -2 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.0&r2=1.10.2.1&cvsroot=bf-blender>
1.48.2.1 +109 -26 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.0&r2=1.48.2.1&cvsroot=bf-blender>
1.21.2.3 +2 -2 blender/source/blender/render/intern/source/envmap.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/render/intern/source/envmap.c.diff?r1=1.21.2.2&r2=1.21.2.3&cvsroot=bf-blender>
1.5.2.3 +4 -8 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.2&r2=1.5.2.3&cvsroot=bf-blender>
1.53.2.8 +65 -11 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.7&r2=1.53.2.8&cvsroot=bf-blender>
1.22.2.2 +39 -28 blender/source/blender/src/booleanops.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/src/booleanops.c.diff?r1=1.22.2.1&r2=1.22.2.2&cvsroot=bf-blender>
1.235.2.10 +3 -3 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.9&r2=1.235.2.10&cvsroot=bf-blender>
1.157.2.20 +1 -3 blender/source/blender/src/buttons_shading.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/src/buttons_shading.c.diff?r1=1.157.2.19&r2=1.157.2.20&cvsroot=bf-blender>
1.70.2.1 +3 -1 blender/source/blender/src/drawipo.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/src/drawipo.c.diff?r1=1.70.2.0&r2=1.70.2.1&cvsroot=bf-blender>
1.254.2.9 +3 -3 blender/source/blender/src/drawobject.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/src/drawobject.c.diff?r1=1.254.2.8&r2=1.254.2.9&cvsroot=bf-blender>
1.24.2.4 +31 -7 blender/source/blender/src/drawoops.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/src/drawoops.c.diff?r1=1.24.2.3&r2=1.24.2.4&cvsroot=bf-blender>
1.80.2.4 +3 -3 blender/source/blender/src/edit.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/src/edit.c.diff?r1=1.80.2.3&r2=1.80.2.4&cvsroot=bf-blender>
1.100.2.7 +5 -8 blender/source/blender/src/editarmature.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/src/editarmature.c.diff?r1=1.100.2.6&r2=1.100.2.7&cvsroot=bf-blender>
1.43.2.3 +6 -15 blender/source/blender/src/editcurve.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/src/editcurve.c.diff?r1=1.43.2.2&r2=1.43.2.3&cvsroot=bf-blender>
1.164.2.5 +3 -7 blender/source/blender/src/editmesh.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/src/editmesh.c.diff?r1=1.164.2.4&r2=1.164.2.5&cvsroot=bf-blender>
1.72.2.4 +2 -1 blender/source/blender/src/editmesh_mods.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/src/editmesh_mods.c.diff?r1=1.72.2.3&r2=1.72.2.4&cvsroot=bf-blender>
1.131.2.9 +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.8&r2=1.131.2.9&cvsroot=bf-blender>
1.279.2.15 +23 -13 blender/source/blender/src/editobject.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/src/editobject.c.diff?r1=1.279.2.14&r2=1.279.2.15&cvsroot=bf-blender>
1.18.2.2 +15 -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.1&r2=1.18.2.2&cvsroot=bf-blender>
1.37.2.3 +2 -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.2&r2=1.37.2.3&cvsroot=bf-blender>
1.143.2.6 +10 -17 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.5&r2=1.143.2.6&cvsroot=bf-blender>
1.22.2.3 +10 -8 blender/source/blender/src/meshtools.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/src/meshtools.c.diff?r1=1.22.2.2&r2=1.22.2.3&cvsroot=bf-blender>
1.59.2.5 +2 -2 blender/source/blender/src/renderwin.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/src/renderwin.c.diff?r1=1.59.2.4&r2=1.59.2.5&cvsroot=bf-blender>
1.317.2.16 +23 -10 blender/source/blender/src/space.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/src/space.c.diff?r1=1.317.2.15&r2=1.317.2.16&cvsroot=bf-blender>
1.31.2.2 +3 -3 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.1&r2=1.31.2.2&cvsroot=bf-blender>
1.6.2.2 +7 -3 blender/source/gameengine/Converter/BL_MeshDeformer.h
<http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/gameengine/Converter/BL_MeshDeformer.h.diff?r1=1.6.2.1&r2=1.6.2.2&cvsroot=bf-blender>
1.8.2.2 +12 -2 blender/source/gameengine/Converter/BL_SkinDeformer.cpp
<http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/gameengine/Converter/BL_SkinDeformer.cpp.diff?r1=1.8.2.1&r2=1.8.2.2&cvsroot=bf-blender>
1.8.2.2 +7 -6 blender/source/gameengine/Converter/BL_SkinDeformer.h
<http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/gameengine/Converter/BL_SkinDeformer.h.diff?r1=1.8.2.1&r2=1.8.2.2&cvsroot=bf-blender>
1.8.2.1 +7 -1 blender/source/gameengine/Expressions/PyObjectPlus.cpp
<http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/gameengine/Expressions/PyObjectPlus.cpp.diff?r1=1.8.2.0&r2=1.8.2.1&cvsroot=bf-blender>
1.11.2.1 +8 -8 blender/source/gameengine/Expressions/PyObjectPlus.h
<http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/gameengine/Expressions/PyObjectPlus.h.diff?r1=1.11.2.0&r2=1.11.2.1&cvsroot=bf-blender>
1.9.2.1 +4 -0 blender/source/gameengine/Expressions/Value.cpp
<http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/gameengine/Expressions/Value.cpp.diff?r1=1.9.2.0&r2=1.9.2.1&cvsroot=bf-blender>
1.6.2.1 +70 -9 blender/source/gameengine/Ketsji/KX_BulletPhysicsController.cpp
<http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/gameengine/Ketsji/KX_BulletPhysicsController.cpp.diff?r1=1.6.2.0&r2=1.6.2.1&cvsroot=bf-blender>
1.27.2.1 +25 -7 blender/source/gameengine/Ketsji/KX_ConvertPhysicsObjects.cpp
<http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/gameengine/Ketsji/KX_ConvertPhysicsObjects.cpp.diff?r1=1.27.2.0&r2=1.27.2.1&cvsroot=bf-blender>
1.4.2.1 +5 -1 blender/source/gameengine/Ketsji/KX_EmptyObject.cpp
<http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/gameengine/Ketsji/KX_EmptyObject.cpp.diff?r1=1.4.2.0&r2=1.4.2.1&cvsroot=bf-blender>
1.6.2.1 +2 -2 blender/source/gameengine/Ketsji/KX_EmptyObject.h
<http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/gameengine/Ketsji/KX_EmptyObject.h.diff?r1=1.6.2.0&r2=1.6.2.1&cvsroot=bf-blender>
1.21.2.2 +10 -3 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.1&r2=1.21.2.2&cvsroot=bf-blender>
1.20.2.2 +3 -3 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.1&r2=1.20.2.2&cvsroot=bf-blender>
1.11.2.1 +88 -23 blender/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp
<http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp.diff?r1=1.11.2.0&r2=1.11.2.1&cvsroot=bf-blender>
1.8.2.1 +13 -3 blender/source/gameengine/Physics/Bullet/CcdPhysicsController.h
<http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/gameengine/Physics/Bullet/CcdPhysicsController.h.diff?r1=1.8.2.0&r2=1.8.2.1&cvsroot=bf-blender>
1.12.2.1 +7 -2 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.0&r2=1.12.2.1&cvsroot=bf-blender>
1.4.2.1 +1 -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.0&r2=1.4.2.1&cvsroot=bf-blender>
More information about the Bf-blender-cvs
mailing list