Blender Git Loki

/intern/boolop/intern/BOP_Merge2.cpp (+944, -0) (View)
/intern/boolop/intern/BOP_Merge2.h (+99, -0) (View)
/intern/boolop/intern/BOP_Misc.h (+54, -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/gameengine/BlenderRoutines/KX_BlenderPolyMaterial.cpp (+0, -114)
/source/gameengine/BlenderRoutines/KX_BlenderPolyMaterial.h (+0, -99)

/bin/.blender/.Blanguages (+1, -0) (Diff)
/intern/boolop/intern/BOP_Edge.cpp (+43, -0) (Diff)
/intern/boolop/intern/BOP_Edge.h (+13, -0) (Diff)
/intern/boolop/intern/BOP_Face.cpp (+2, -0) (Diff)
/intern/boolop/intern/BOP_Face.h (+3, -0) (Diff)
/intern/boolop/intern/BOP_Interface.cpp (+29, -1) (Diff)
/intern/boolop/intern/BOP_Merge.cpp (+3, -0) (Diff)
/intern/boolop/intern/BOP_Merge.h (+5, -0) (Diff)
/intern/boolop/intern/BOP_Mesh.cpp (+10, -1) (Diff)
/intern/boolop/intern/BOP_Mesh.h (+0, -7) (Diff)
/intern/boolop/intern/BOP_Tag.h (+1, -1) (Diff)
/intern/boolop/intern/BOP_Vertex.cpp (+19, -0) (Diff)
/intern/boolop/intern/BOP_Vertex.h (+5, -0) (Diff)
/projectfiles_vc7/blender/makesdna/DNA_makesdna.vcproj (+3, -0) (Diff)
/projectfiles_vc7/blender/src/BL_src.vcproj (+15, -0) (Diff)
/projectfiles_vc7/gameengine/blenderhook/KX_blenderhook.vcproj (+0, -6) (Diff)
/release/scripts/rvk1_torvk2.py (+32, -32) (Diff)
/source/blender/blenkernel/bad_level_call_stubs/stubs.c (+2, -2) (Diff)
/source/blender/blenkernel/BKE_blender.h (+1, -1) (Diff)
/source/blender/blenkernel/BKE_DerivedMesh.h (+2, -0) (Diff)
/source/blender/blenkernel/BKE_idprop.h (+1, -0) (Diff)
/source/blender/blenkernel/BKE_shrinkwrap.h (+7, -0) (Diff)
/source/blender/blenkernel/BKE_texture.h (+1, -0) (Diff)
/source/blender/blenkernel/intern/collision.c (+1, -1) (Diff)
/source/blender/blenkernel/intern/constraint.c (+139, -3) (Diff)
/source/blender/blenkernel/intern/customdata.c (+4, -3) (Diff)
/source/blender/blenkernel/intern/DerivedMesh.c (+122, -0) (Diff)
/source/blender/blenkernel/intern/idprop.c (+12, -3) (Diff)
/source/blender/blenkernel/intern/scene.c (+1, -1) (Diff)
/source/blender/blenkernel/intern/softbody.c (+3, -3) (Diff)
/source/blender/blenkernel/intern/texture.c (+14, -1) (Diff)
/source/blender/blenlib/intern/arithb.c (+0, -5) (Diff)
/source/blender/blenlib/intern/freetypefont.c (+1, -1) (Diff)
/source/blender/blenloader/intern/readfile.c (+78, -12) (Diff)
/source/blender/blenloader/intern/writefile.c (+1, -0) (Diff)
/source/blender/include/BDR_gpencil.h (+10, -3) (Diff)
/source/blender/include/BIF_editaction.h (+7, -3) (Diff)
/source/blender/include/BIF_editarmature.h (+1, -0) (Diff)
/source/blender/include/BIF_editview.h (+3, -0) (Diff)
/source/blender/include/BSE_drawview.h (+1, -0) (Diff)
/source/blender/include/butspace.h (+2, -1) (Diff)
/source/blender/makesdna/DNA_action_types.h (+0, -1) (Diff)
/source/blender/makesdna/DNA_actuator_types.h (+3, -3) (Diff)
/source/blender/makesdna/DNA_armature_types.h (+2, -1) (Diff)
/source/blender/makesdna/DNA_constraint_types.h (+15, -7) (Diff)
/source/blender/makesdna/DNA_customdata_types.h (+3, -1) (Diff)
/source/blender/makesdna/DNA_gpencil_types.h (+7, -5) (Diff)
/source/blender/makesdna/DNA_ID.h (+2, -1) (Diff)
/source/blender/makesdna/DNA_meshdata_types.h (+1, -1) (Diff)
/source/blender/makesdna/DNA_object_types.h (+2, -0) (Diff)
/source/blender/makesdna/DNA_sequence_types.h (+1, -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/Armature.c (+2, -0) (Diff)
/source/blender/python/api2_2x/Bone.c (+9, -1) (Diff)
/source/blender/python/api2_2x/doc/Armature.py (+3, -0) (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/IDProp.c (+46, -11) (Diff)
/source/blender/python/api2_2x/sceneRender.c (+33, -5) (Diff)
/source/blender/python/BPY_interface.c (+2, -0) (Diff)
/source/blender/src/buttons_editing.c (+8, -6) (Diff)
/source/blender/src/buttons_logic.c (+59, -44) (Diff)
/source/blender/src/buttons_object.c (+21, -2) (Diff)
/source/blender/src/drawaction.c (+98, -19) (Diff)
/source/blender/src/drawgpencil.c (+148, -83) (Diff)
/source/blender/src/drawnode.c (+1, -1) (Diff)
/source/blender/src/drawseq.c (+1, -1) (Diff)
/source/blender/src/drawview.c (+27, -17) (Diff)
/source/blender/src/editaction.c (+65, -30) (Diff)
/source/blender/src/editaction_gpencil.c (+3, -4) (Diff)
/source/blender/src/editarmature.c (+26, -0) (Diff)
/source/blender/src/editipo.c (+10, -1) (Diff)
/source/blender/src/editnode.c (+12, -4) (Diff)
/source/blender/src/editobject.c (+17, -2) (Diff)
/source/blender/src/editseq.c (+31, -3) (Diff)
/source/blender/src/editview.c (+2, -2) (Diff)
/source/blender/src/gpencil.c (+329, -167) (Diff)
/source/blender/src/header_action.c (+2, -19) (Diff)
/source/blender/src/header_ipo.c (+1, -1) (Diff)
/source/blender/src/header_view3d.c (+1, -0) (Diff)
/source/blender/src/interface.c (+3, -1) (Diff)
/source/blender/src/interface_draw.c (+1, -1) (Diff)
/source/blender/src/meshlaplacian.c (+1, -1) (Diff)
/source/blender/src/outliner.c (+59, -2) (Diff)
/source/blender/src/poseobject.c (+97, -59) (Diff)
/source/blender/src/sequence.c (+2, -2) (Diff)
/source/blender/src/space.c (+19, -4) (Diff)
/source/blender/src/transform_conversions.c (+4, -0) (Diff)
/source/blender/src/transform_manipulator.c (+10, -0) (Diff)
/source/creator/creator.c (+22, -0) (Diff)
/source/gameengine/BlenderRoutines/KX_BlenderGL.cpp (+1, -0) (Diff)
/source/gameengine/BlenderRoutines/KX_BlenderRenderTools.cpp (+0, -1) (Diff)
/source/gameengine/Converter/BL_ActionActuator.cpp (+6, -18) (Diff)
/source/gameengine/Converter/BL_ArmatureObject.cpp (+4, -5) (Diff)
/source/gameengine/Converter/BL_BlenderDataConversion.cpp (+297, -380) (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 (+8, -6) (Diff)
/source/gameengine/Converter/KX_ConvertSensors.cpp (+3, -3) (Diff)
/source/gameengine/Converter/KX_IpoConvert.cpp (+43, -16) (Diff)
/source/gameengine/Converter/KX_IpoConvert.h (+1, -1) (Diff)
/source/gameengine/GameLogic/SCA_ActuatorEventManager.cpp (+2, -11) (Diff)
/source/gameengine/GameLogic/SCA_ActuatorEventManager.h (+0, -1) (Diff)
/source/gameengine/GameLogic/SCA_ActuatorSensor.cpp (+3, -2) (Diff)
/source/gameengine/GameLogic/SCA_ActuatorSensor.h (+1, -1) (Diff)
/source/gameengine/GameLogic/SCA_AlwaysEventManager.cpp (+2, -9) (Diff)
/source/gameengine/GameLogic/SCA_AlwaysEventManager.h (+0, -1) (Diff)
/source/gameengine/GameLogic/SCA_EventManager.cpp (+5, -8) (Diff)
/source/gameengine/GameLogic/SCA_EventManager.h (+4, -2) (Diff)
/source/gameengine/GameLogic/SCA_IObject.cpp (+23, -4) (Diff)
/source/gameengine/GameLogic/SCA_ISensor.cpp (+21, -15) (Diff)
/source/gameengine/GameLogic/SCA_ISensor.h (+8, -6) (Diff)
/source/gameengine/GameLogic/SCA_JoystickManager.cpp (+3, -8) (Diff)
/source/gameengine/GameLogic/SCA_JoystickManager.h (+0, -1) (Diff)
/source/gameengine/GameLogic/SCA_KeyboardManager.cpp (+3, -12) (Diff)
/source/gameengine/GameLogic/SCA_KeyboardManager.h (+0, -1) (Diff)
/source/gameengine/GameLogic/SCA_LogicManager.cpp (+12, -12) (Diff)
/source/gameengine/GameLogic/SCA_LogicManager.h (+4, -3) (Diff)
/source/gameengine/GameLogic/SCA_MouseManager.cpp (+3, -11) (Diff)
/source/gameengine/GameLogic/SCA_MouseManager.h (+0, -1) (Diff)
/source/gameengine/GameLogic/SCA_PropertyEventManager.cpp (+1, -10) (Diff)
/source/gameengine/GameLogic/SCA_PropertyEventManager.h (+0, -1) (Diff)
/source/gameengine/GameLogic/SCA_RandomEventManager.cpp (+2, -9) (Diff)
/source/gameengine/GameLogic/SCA_RandomEventManager.h (+0, -1) (Diff)
/source/gameengine/GameLogic/SCA_TimeEventManager.cpp (+5, -0) (Diff)
/source/gameengine/GameLogic/SCA_TimeEventManager.h (+1, -0) (Diff)
/source/gameengine/Ketsji/BL_BlenderShader.cpp (+68, -17) (Diff)
/source/gameengine/Ketsji/BL_BlenderShader.h (+12, -2) (Diff)
/source/gameengine/Ketsji/BL_Material.h (+2, -3) (Diff)
/source/gameengine/Ketsji/BL_Texture.cpp (+0, -2) (Diff)
/source/gameengine/Ketsji/KXNetwork/KX_NetworkEventManager.cpp (+1, -16) (Diff)
/source/gameengine/Ketsji/KXNetwork/KX_NetworkEventManager.h (+0, -3) (Diff)
/source/gameengine/Ketsji/KX_BlenderMaterial.cpp (+78, -43) (Diff)
/source/gameengine/Ketsji/KX_BlenderMaterial.h (+7, -2) (Diff)
/source/gameengine/Ketsji/KX_BulletPhysicsController.cpp (+1, -1) (Diff)
/source/gameengine/Ketsji/KX_ConstraintActuator.cpp (+79, -48) (Diff)
/source/gameengine/Ketsji/KX_ConstraintActuator.h (+16, -12) (Diff)
/source/gameengine/Ketsji/KX_GameObject.cpp (+43, -21) (Diff)
/source/gameengine/Ketsji/KX_GameObject.h (+1, -0) (Diff)
/source/gameengine/Ketsji/KX_IpoActuator.cpp (+20, -24) (Diff)
/source/gameengine/Ketsji/KX_IpoActuator.h (+6, -6) (Diff)
/source/gameengine/Ketsji/KX_KetsjiEngine.cpp (+2, -1) (Diff)
/source/gameengine/Ketsji/KX_MaterialIpoController.cpp (+1, -0) (Diff)
/source/gameengine/Ketsji/KX_MaterialIpoController.h (+6, -2) (Diff)
/source/gameengine/Ketsji/KX_NearSensor.cpp (+8, -0) (Diff)
/source/gameengine/Ketsji/KX_NearSensor.h (+1, -0) (Diff)
/source/gameengine/Ketsji/KX_ObjectActuator.cpp (+33, -44) (Diff)
/source/gameengine/Ketsji/KX_ObjectActuator.h (+11, -11) (Diff)
/source/gameengine/Ketsji/KX_PolygonMaterial.cpp (+6, -4) (Diff)
/source/gameengine/Ketsji/KX_PolygonMaterial.h (+2, -1) (Diff)
/source/gameengine/Ketsji/KX_PyMath.h (+20, -3) (Diff)
/source/gameengine/Ketsji/KX_PythonInit.cpp (+9, -0) (Diff)
/source/gameengine/Ketsji/KX_RayEventManager.cpp (+2, -7) (Diff)
/source/gameengine/Ketsji/KX_RayEventManager.h (+0, -1) (Diff)
/source/gameengine/Ketsji/KX_Scene.cpp (+39, -16) (Diff)
/source/gameengine/Ketsji/KX_TouchEventManager.cpp (+11, -20) (Diff)
/source/gameengine/Ketsji/KX_TouchEventManager.h (+1, -1) (Diff)
/source/gameengine/Ketsji/KX_TouchSensor.cpp (+8, -0) (Diff)
/source/gameengine/Ketsji/KX_TouchSensor.h (+1, -0) (Diff)
/source/gameengine/Ketsji/KX_TrackToActuator.cpp (+14, -4) (Diff)
/source/gameengine/Physics/BlOde/OdePhysicsEnvironment.h (+1, -0) (Diff)
/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp (+25, -72) (Diff)
/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.h (+3, -8) (Diff)
/source/gameengine/Physics/common/PHY_IPhysicsEnvironment.h (+1, -0) (Diff)
/source/gameengine/Physics/Dummy/DummyPhysicsEnvironment.h (+1, -0) (Diff)
/source/gameengine/Physics/Sumo/Fuzzics/src/SM_Scene.cpp (+11, -6) (Diff)
/source/gameengine/Physics/Sumo/SumoPhysicsEnvironment.cpp (+6, -0) (Diff)
/source/gameengine/Physics/Sumo/SumoPhysicsEnvironment.h (+1, -0) (Diff)
/source/gameengine/PyDoc/KX_ConstraintActuator.py (+114, -6) (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_BucketManager.cpp (+27, -16) (Diff)
/source/gameengine/Rasterizer/RAS_BucketManager.h (+2, -1) (Diff)
/source/gameengine/Rasterizer/RAS_CameraData.h (+1, -1) (Diff)
/source/gameengine/Rasterizer/RAS_IPolygonMaterial.cpp (+14, -5) (Diff)
/source/gameengine/Rasterizer/RAS_IPolygonMaterial.h (+7, -4) (Diff)
/source/gameengine/Rasterizer/RAS_IRasterizer.h (+4, -6) (Diff)
/source/gameengine/Rasterizer/RAS_MaterialBucket.cpp (+7, -17) (Diff)
/source/gameengine/Rasterizer/RAS_MaterialBucket.h (+2, -5) (Diff)
/source/gameengine/Rasterizer/RAS_MeshObject.cpp (+106, -95) (Diff)
/source/gameengine/Rasterizer/RAS_MeshObject.h (+14, -16) (Diff)
/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp (+36, -12) (Diff)
/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.h (+5, -4) (Diff)
/source/gameengine/Rasterizer/RAS_Polygon.cpp (+0, -18) (Diff)