Blender Git Loki
Git Commits -> Revision 4a8aa06
Revision 4a8aa06 by Ian Thompson (master) July 26, 2008, 10:45 (GMT) |
Merge from trunk revs. 15635:15771 |
Commit Details:
Full Hash: 4a8aa06a1477f044dd41518d4a8ac633f32f653c
SVN Revision: 15777
Parent Commit: 4c6e0d4
Lines Changed: +6314, -1074
9 Added Paths:
/source/blender/include/BDR_gpencil.h (+74, -0) (View)
/source/blender/include/BIF_drawgpencil.h (+44, -0) (View)
/source/blender/makesdna/DNA_gpencil_types.h (+143, -0) (View)
/source/blender/src/drawgpencil.c (+673, -0) (View)
/source/blender/src/editaction_gpencil.c (+548, -0) (View)
/source/blender/src/gpencil.c (+1197, -0) (View)
/source/gameengine/PyDoc/BL_ShapeActionActuator.py (+158, -0) (View)
/source/gameengine/PyDoc/KX_ActuatorSensor.py (+24, -0) (View)
/source/gameengine/PyDoc/KX_StateActuator.py (+26, -0) (View)
/source/blender/include/BIF_drawgpencil.h (+44, -0) (View)
/source/blender/makesdna/DNA_gpencil_types.h (+143, -0) (View)
/source/blender/src/drawgpencil.c (+673, -0) (View)
/source/blender/src/editaction_gpencil.c (+548, -0) (View)
/source/blender/src/gpencil.c (+1197, -0) (View)
/source/gameengine/PyDoc/BL_ShapeActionActuator.py (+158, -0) (View)
/source/gameengine/PyDoc/KX_ActuatorSensor.py (+24, -0) (View)
/source/gameengine/PyDoc/KX_StateActuator.py (+26, -0) (View)
127 Modified Paths:
/projectfiles_vc7/blender/makesdna/DNA_makesdna.vcproj (+3, -0) (Diff)
/projectfiles_vc7/blender/src/BL_src.vcproj (+15, -0) (Diff)
/source/blender/blenkernel/bad_level_call_stubs/stubs.c (+2, -1) (Diff)
/source/blender/blenkernel/BKE_global.h (+2, -0) (Diff)
/source/blender/blenkernel/BKE_idprop.h (+1, -0) (Diff)
/source/blender/blenkernel/intern/collision.c (+3, -0) (Diff)
/source/blender/blenkernel/intern/idprop.c (+12, -3) (Diff)
/source/blender/blenkernel/intern/lattice.c (+4, -1) (Diff)
/source/blender/blenkernel/intern/particle_system.c (+4, -1) (Diff)
/source/blender/blenkernel/intern/scene.c (+1, -1) (Diff)
/source/blender/blenkernel/intern/softbody.c (+3, -3) (Diff)
/source/blender/blenlib/intern/arithb.c (+0, -5) (Diff)
/source/blender/blenloader/intern/readfile.c (+75, -8) (Diff)
/source/blender/blenloader/intern/writefile.c (+34, -1) (Diff)
/source/blender/include/BDR_drawaction.h (+3, -0) (Diff)
/source/blender/include/BIF_editaction.h (+31, -3) (Diff)
/source/blender/include/BIF_space.h (+7, -1) (Diff)
/source/blender/include/BSE_drawview.h (+1, -0) (Diff)
/source/blender/include/BSE_editaction_types.h (+4, -2) (Diff)
/source/blender/include/transform.h (+1, -0) (Diff)
/source/blender/makesdna/DNA_action_types.h (+17, -2) (Diff)
/source/blender/makesdna/DNA_actuator_types.h (+3, -3) (Diff)
/source/blender/makesdna/DNA_ID.h (+2, -1) (Diff)
/source/blender/makesdna/DNA_sequence_types.h (+1, -0) (Diff)
/source/blender/makesdna/DNA_space_types.h (+8, -0) (Diff)
/source/blender/makesdna/DNA_view3d_types.h (+13, -2) (Diff)
/source/blender/makesdna/intern/makesdna.c (+2, -0) (Diff)
/source/blender/nodes/intern/SHD_nodes/SHD_material.c (+0, -3) (Diff)
/source/blender/nodes/intern/SHD_util.c (+2, -2) (Diff)
/source/blender/nodes/intern/SHD_util.h (+6, -7) (Diff)
/source/blender/python/api2_2x/Blender.c (+1, -1) (Diff)
/source/blender/python/api2_2x/doc/IDProp.py (+3, -1) (Diff)
/source/blender/python/api2_2x/doc/Ipo.py (+2, -2) (Diff)
/source/blender/python/api2_2x/doc/LibData.py (+31, -11) (Diff)
/source/blender/python/api2_2x/doc/Particle.py (+24, -205) (Diff)
/source/blender/python/api2_2x/IDProp.c (+46, -11) (Diff)
/source/blender/python/api2_2x/Library.c (+69, -0) (Diff)
/source/blender/python/api2_2x/Particle.c (+322, -150) (Diff)
/source/blender/python/api2_2x/sceneRender.c (+3, -1) (Diff)
/source/blender/python/BPY_interface.c (+2, -0) (Diff)
/source/blender/render/intern/source/shadeoutput.c (+2, -0) (Diff)
/source/blender/src/buttons_editing.c (+1, -1) (Diff)
/source/blender/src/buttons_logic.c (+8, -6) (Diff)
/source/blender/src/drawaction.c (+206, -21) (Diff)
/source/blender/src/drawnode.c (+77, -0) (Diff)
/source/blender/src/drawobject.c (+5, -0) (Diff)
/source/blender/src/drawseq.c (+79, -18) (Diff)
/source/blender/src/drawview.c (+95, -25) (Diff)
/source/blender/src/editaction.c (+390, -63) (Diff)
/source/blender/src/editnode.c (+43, -8) (Diff)
/source/blender/src/editseq.c (+31, -3) (Diff)
/source/blender/src/header_action.c (+255, -109) (Diff)
/source/blender/src/header_node.c (+10, -0) (Diff)
/source/blender/src/header_seq.c (+12, -1) (Diff)
/source/blender/src/header_view3d.c (+4, -0) (Diff)
/source/blender/src/interface.c (+5, -0) (Diff)
/source/blender/src/interface_draw.c (+1, -1) (Diff)
/source/blender/src/outliner.c (+64, -0) (Diff)
/source/blender/src/space.c (+43, -8) (Diff)
/source/blender/src/transform_conversions.c (+215, -8) (Diff)
/source/blender/src/transform_generics.c (+9, -0) (Diff)
/source/blender/src/usiblender.c (+1, -1) (Diff)
/source/gameengine/BlenderRoutines/KX_BlenderCanvas.cpp (+12, -0) (Diff)
/source/gameengine/BlenderRoutines/KX_BlenderCanvas.h (+5, -0) (Diff)
/source/gameengine/Converter/BL_BlenderDataConversion.cpp (+3, -7) (Diff)
/source/gameengine/Converter/BL_DeformableGameObject.h (+1, -0) (Diff)
/source/gameengine/Converter/BL_ShapeActionActuator.cpp (+26, -33) (Diff)
/source/gameengine/Converter/BL_ShapeActionActuator.h (+8, -8) (Diff)
/source/gameengine/Converter/KX_ConvertActuators.cpp (+9, -7) (Diff)
/source/gameengine/Converter/KX_IpoConvert.cpp (+43, -16) (Diff)
/source/gameengine/Converter/KX_IpoConvert.h (+1, -1) (Diff)
/source/gameengine/GameLogic/SCA_ActuatorSensor.cpp (+3, -2) (Diff)
/source/gameengine/GameLogic/SCA_ActuatorSensor.h (+1, -1) (Diff)
/source/gameengine/GameLogic/SCA_ILogicBrick.cpp (+4, -1) (Diff)
/source/gameengine/GameLogic/SCA_ILogicBrick.h (+3, -0) (Diff)
/source/gameengine/GameLogic/SCA_ISensor.cpp (+13, -14) (Diff)
/source/gameengine/GameLogic/SCA_ISensor.h (+5, -5) (Diff)
/source/gameengine/GameLogic/SCA_PropertyActuator.cpp (+27, -6) (Diff)
/source/gameengine/GameLogic/SCA_PropertyActuator.h (+5, -3) (Diff)
/source/gameengine/GamePlayer/common/GPC_Canvas.h (+6, -0) (Diff)
/source/gameengine/Ketsji/KX_BulletPhysicsController.cpp (+18, -5) (Diff)
/source/gameengine/Ketsji/KX_BulletPhysicsController.h (+5, -1) (Diff)
/source/gameengine/Ketsji/KX_CameraActuator.cpp (+49, -13) (Diff)
/source/gameengine/Ketsji/KX_CameraActuator.h (+6, -2) (Diff)
/source/gameengine/Ketsji/KX_ConstraintActuator.cpp (+82, -49) (Diff)
/source/gameengine/Ketsji/KX_ConstraintActuator.h (+16, -12) (Diff)
/source/gameengine/Ketsji/KX_GameObject.cpp (+102, -25) (Diff)
/source/gameengine/Ketsji/KX_GameObject.h (+3, -0) (Diff)
/source/gameengine/Ketsji/KX_IPhysicsController.h (+2, -1) (Diff)
/source/gameengine/Ketsji/KX_IpoActuator.cpp (+20, -24) (Diff)
/source/gameengine/Ketsji/KX_IpoActuator.h (+6, -6) (Diff)
/source/gameengine/Ketsji/KX_MaterialIpoController.cpp (+1, -0) (Diff)
/source/gameengine/Ketsji/KX_MaterialIpoController.h (+6, -2) (Diff)
/source/gameengine/Ketsji/KX_ObjectActuator.cpp (+33, -44) (Diff)
/source/gameengine/Ketsji/KX_ObjectActuator.h (+11, -11) (Diff)
/source/gameengine/Ketsji/KX_OdePhysicsController.cpp (+2, -1) (Diff)
/source/gameengine/Ketsji/KX_OdePhysicsController.h (+1, -1) (Diff)
/source/gameengine/Ketsji/KX_ParentActuator.cpp (+46, -5) (Diff)
/source/gameengine/Ketsji/KX_ParentActuator.h (+5, -2) (Diff)
/source/gameengine/Ketsji/KX_PyMath.h (+20, -3) (Diff)
/source/gameengine/Ketsji/KX_PythonInit.cpp (+9, -0) (Diff)
/source/gameengine/Ketsji/KX_RadarSensor.cpp (+4, -2) (Diff)
/source/gameengine/Ketsji/KX_SCA_AddObjectActuator.cpp (+11, -0) (Diff)
/source/gameengine/Ketsji/KX_SCA_AddObjectActuator.h (+3, -0) (Diff)
/source/gameengine/Ketsji/KX_Scene.cpp (+26, -18) (Diff)
/source/gameengine/Ketsji/KX_SceneActuator.cpp (+43, -2) (Diff)
/source/gameengine/Ketsji/KX_SceneActuator.h (+3, -0) (Diff)
/source/gameengine/Ketsji/KX_SumoPhysicsController.cpp (+2, -1) (Diff)
/source/gameengine/Ketsji/KX_SumoPhysicsController.h (+1, -1) (Diff)
/source/gameengine/Ketsji/KX_TrackToActuator.cpp (+16, -4) (Diff)
/source/gameengine/Ketsji/KX_TrackToActuator.h (+1, -0) (Diff)
/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp (+28, -6) (Diff)
/source/gameengine/Physics/Bullet/CcdPhysicsController.h (+4, -1) (Diff)
/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp (+32, -0) (Diff)
/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.h (+9, -0) (Diff)
/source/gameengine/PyDoc/KX_ConstraintActuator.py (+114, -6) (Diff)
/source/gameengine/PyDoc/KX_GameObject.py (+12, -0) (Diff)
/source/gameengine/PyDoc/KX_IpoActuator.py (+16, -3) (Diff)
/source/gameengine/PyDoc/KX_ObjectActuator.py (+101, -3) (Diff)
/source/gameengine/PyDoc/SCA_ISensor.py (+18, -0) (Diff)
/source/gameengine/Rasterizer/RAS_2DFilterManager.cpp (+16, -9) (Diff)
/source/gameengine/Rasterizer/RAS_2DFilterManager.h (+1, -1) (Diff)
/source/gameengine/Rasterizer/RAS_ICanvas.h (+8, -0) (Diff)
/source/gameengine/Rasterizer/RAS_IPolygonMaterial.cpp (+5, -0) (Diff)
/source/gameengine/Rasterizer/RAS_IPolygonMaterial.h (+1, -0) (Diff)
/source/gameengine/Rasterizer/RAS_MeshObject.cpp (+14, -1) (Diff)
/source/gameengine/Rasterizer/RAS_MeshObject.h (+1, -0) (Diff)
/projectfiles_vc7/blender/src/BL_src.vcproj (+15, -0) (Diff)
/source/blender/blenkernel/bad_level_call_stubs/stubs.c (+2, -1) (Diff)
/source/blender/blenkernel/BKE_global.h (+2, -0) (Diff)
/source/blender/blenkernel/BKE_idprop.h (+1, -0) (Diff)
/source/blender/blenkernel/intern/collision.c (+3, -0) (Diff)
/source/blender/blenkernel/intern/idprop.c (+12, -3) (Diff)
/source/blender/blenkernel/intern/lattice.c (+4, -1) (Diff)
/source/blender/blenkernel/intern/particle_system.c (+4, -1) (Diff)
/source/blender/blenkernel/intern/scene.c (+1, -1) (Diff)
/source/blender/blenkernel/intern/softbody.c (+3, -3) (Diff)
/source/blender/blenlib/intern/arithb.c (+0, -5) (Diff)
/source/blender/blenloader/intern/readfile.c (+75, -8) (Diff)
/source/blender/blenloader/intern/writefile.c (+34, -1) (Diff)
/source/blender/include/BDR_drawaction.h (+3, -0) (Diff)
/source/blender/include/BIF_editaction.h (+31, -3) (Diff)
/source/blender/include/BIF_space.h (+7, -1) (Diff)
/source/blender/include/BSE_drawview.h (+1, -0) (Diff)
/source/blender/include/BSE_editaction_types.h (+4, -2) (Diff)
/source/blender/include/transform.h (+1, -0) (Diff)
/source/blender/makesdna/DNA_action_types.h (+17, -2) (Diff)
/source/blender/makesdna/DNA_actuator_types.h (+3, -3) (Diff)
/source/blender/makesdna/DNA_ID.h (+2, -1) (Diff)
/source/blender/makesdna/DNA_sequence_types.h (+1, -0) (Diff)
/source/blender/makesdna/DNA_space_types.h (+8, -0) (Diff)
/source/blender/makesdna/DNA_view3d_types.h (+13, -2) (Diff)
/source/blender/makesdna/intern/makesdna.c (+2, -0) (Diff)
/source/blender/nodes/intern/SHD_nodes/SHD_material.c (+0, -3) (Diff)
/source/blender/nodes/intern/SHD_util.c (+2, -2) (Diff)
/source/blender/nodes/intern/SHD_util.h (+6, -7) (Diff)
/source/blender/python/api2_2x/Blender.c (+1, -1) (Diff)
/source/blender/python/api2_2x/doc/IDProp.py (+3, -1) (Diff)
/source/blender/python/api2_2x/doc/Ipo.py (+2, -2) (Diff)
/source/blender/python/api2_2x/doc/LibData.py (+31, -11) (Diff)
/source/blender/python/api2_2x/doc/Particle.py (+24, -205) (Diff)
/source/blender/python/api2_2x/IDProp.c (+46, -11) (Diff)
/source/blender/python/api2_2x/Library.c (+69, -0) (Diff)
/source/blender/python/api2_2x/Particle.c (+322, -150) (Diff)
/source/blender/python/api2_2x/sceneRender.c (+3, -1) (Diff)
/source/blender/python/BPY_interface.c (+2, -0) (Diff)
/source/blender/render/intern/source/shadeoutput.c (+2, -0) (Diff)
/source/blender/src/buttons_editing.c (+1, -1) (Diff)
/source/blender/src/buttons_logic.c (+8, -6) (Diff)
/source/blender/src/drawaction.c (+206, -21) (Diff)
/source/blender/src/drawnode.c (+77, -0) (Diff)
/source/blender/src/drawobject.c (+5, -0) (Diff)
/source/blender/src/drawseq.c (+79, -18) (Diff)
/source/blender/src/drawview.c (+95, -25) (Diff)
/source/blender/src/editaction.c (+390, -63) (Diff)
/source/blender/src/editnode.c (+43, -8) (Diff)
/source/blender/src/editseq.c (+31, -3) (Diff)
/source/blender/src/header_action.c (+255, -109) (Diff)
/source/blender/src/header_node.c (+10, -0) (Diff)
/source/blender/src/header_seq.c (+12, -1) (Diff)
/source/blender/src/header_view3d.c (+4, -0) (Diff)
/source/blender/src/interface.c (+5, -0) (Diff)
/source/blender/src/interface_draw.c (+1, -1) (Diff)
/source/blender/src/outliner.c (+64, -0) (Diff)
/source/blender/src/space.c (+43, -8) (Diff)
/source/blender/src/transform_conversions.c (+215, -8) (Diff)
/source/blender/src/transform_generics.c (+9, -0) (Diff)
/source/blender/src/usiblender.c (+1, -1) (Diff)
/source/gameengine/BlenderRoutines/KX_BlenderCanvas.cpp (+12, -0) (Diff)
/source/gameengine/BlenderRoutines/KX_BlenderCanvas.h (+5, -0) (Diff)
/source/gameengine/Converter/BL_BlenderDataConversion.cpp (+3, -7) (Diff)
/source/gameengine/Converter/BL_DeformableGameObject.h (+1, -0) (Diff)
/source/gameengine/Converter/BL_ShapeActionActuator.cpp (+26, -33) (Diff)
/source/gameengine/Converter/BL_ShapeActionActuator.h (+8, -8) (Diff)
/source/gameengine/Converter/KX_ConvertActuators.cpp (+9, -7) (Diff)
/source/gameengine/Converter/KX_IpoConvert.cpp (+43, -16) (Diff)
/source/gameengine/Converter/KX_IpoConvert.h (+1, -1) (Diff)
/source/gameengine/GameLogic/SCA_ActuatorSensor.cpp (+3, -2) (Diff)
/source/gameengine/GameLogic/SCA_ActuatorSensor.h (+1, -1) (Diff)
/source/gameengine/GameLogic/SCA_ILogicBrick.cpp (+4, -1) (Diff)
/source/gameengine/GameLogic/SCA_ILogicBrick.h (+3, -0) (Diff)
/source/gameengine/GameLogic/SCA_ISensor.cpp (+13, -14) (Diff)
/source/gameengine/GameLogic/SCA_ISensor.h (+5, -5) (Diff)
/source/gameengine/GameLogic/SCA_PropertyActuator.cpp (+27, -6) (Diff)
/source/gameengine/GameLogic/SCA_PropertyActuator.h (+5, -3) (Diff)
/source/gameengine/GamePlayer/common/GPC_Canvas.h (+6, -0) (Diff)
/source/gameengine/Ketsji/KX_BulletPhysicsController.cpp (+18, -5) (Diff)
/source/gameengine/Ketsji/KX_BulletPhysicsController.h (+5, -1) (Diff)
/source/gameengine/Ketsji/KX_CameraActuator.cpp (+49, -13) (Diff)
/source/gameengine/Ketsji/KX_CameraActuator.h (+6, -2) (Diff)
/source/gameengine/Ketsji/KX_ConstraintActuator.cpp (+82, -49) (Diff)
/source/gameengine/Ketsji/KX_ConstraintActuator.h (+16, -12) (Diff)
/source/gameengine/Ketsji/KX_GameObject.cpp (+102, -25) (Diff)
/source/gameengine/Ketsji/KX_GameObject.h (+3, -0) (Diff)
/source/gameengine/Ketsji/KX_IPhysicsController.h (+2, -1) (Diff)
/source/gameengine/Ketsji/KX_IpoActuator.cpp (+20, -24) (Diff)
/source/gameengine/Ketsji/KX_IpoActuator.h (+6, -6) (Diff)
/source/gameengine/Ketsji/KX_MaterialIpoController.cpp (+1, -0) (Diff)
/source/gameengine/Ketsji/KX_MaterialIpoController.h (+6, -2) (Diff)
/source/gameengine/Ketsji/KX_ObjectActuator.cpp (+33, -44) (Diff)
/source/gameengine/Ketsji/KX_ObjectActuator.h (+11, -11) (Diff)
/source/gameengine/Ketsji/KX_OdePhysicsController.cpp (+2, -1) (Diff)
/source/gameengine/Ketsji/KX_OdePhysicsController.h (+1, -1) (Diff)
/source/gameengine/Ketsji/KX_ParentActuator.cpp (+46, -5) (Diff)
/source/gameengine/Ketsji/KX_ParentActuator.h (+5, -2) (Diff)
/source/gameengine/Ketsji/KX_PyMath.h (+20, -3) (Diff)
/source/gameengine/Ketsji/KX_PythonInit.cpp (+9, -0) (Diff)
/source/gameengine/Ketsji/KX_RadarSensor.cpp (+4, -2) (Diff)
/source/gameengine/Ketsji/KX_SCA_AddObjectActuator.cpp (+11, -0) (Diff)
/source/gameengine/Ketsji/KX_SCA_AddObjectActuator.h (+3, -0) (Diff)
/source/gameengine/Ketsji/KX_Scene.cpp (+26, -18) (Diff)
/source/gameengine/Ketsji/KX_SceneActuator.cpp (+43, -2) (Diff)
/source/gameengine/Ketsji/KX_SceneActuator.h (+3, -0) (Diff)
/source/gameengine/Ketsji/KX_SumoPhysicsController.cpp (+2, -1) (Diff)
/source/gameengine/Ketsji/KX_SumoPhysicsController.h (+1, -1) (Diff)
/source/gameengine/Ketsji/KX_TrackToActuator.cpp (+16, -4) (Diff)
/source/gameengine/Ketsji/KX_TrackToActuator.h (+1, -0) (Diff)
/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp (+28, -6) (Diff)
/source/gameengine/Physics/Bullet/CcdPhysicsController.h (+4, -1) (Diff)
/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp (+32, -0) (Diff)
/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.h (+9, -0) (Diff)
/source/gameengine/PyDoc/KX_ConstraintActuator.py (+114, -6) (Diff)
/source/gameengine/PyDoc/KX_GameObject.py (+12, -0) (Diff)
/source/gameengine/PyDoc/KX_IpoActuator.py (+16, -3) (Diff)
/source/gameengine/PyDoc/KX_ObjectActuator.py (+101, -3) (Diff)
/source/gameengine/PyDoc/SCA_ISensor.py (+18, -0) (Diff)
/source/gameengine/Rasterizer/RAS_2DFilterManager.cpp (+16, -9) (Diff)
/source/gameengine/Rasterizer/RAS_2DFilterManager.h (+1, -1) (Diff)
/source/gameengine/Rasterizer/RAS_ICanvas.h (+8, -0) (Diff)
/source/gameengine/Rasterizer/RAS_IPolygonMaterial.cpp (+5, -0) (Diff)
/source/gameengine/Rasterizer/RAS_IPolygonMaterial.h (+1, -0) (Diff)
/source/gameengine/Rasterizer/RAS_MeshObject.cpp (+14, -1) (Diff)
/source/gameengine/Rasterizer/RAS_MeshObject.h (+1, -0) (Diff)
Master Commits
MiikaH:n Sivut a.k.a. MiikaHweb | 2003-2021