Blender Git Loki
Git Commits -> Revision 7beb743
Revision 7beb743 by Antonis Ryakiotakis (soc-2013-paint) August 4, 2013, 14:04 (GMT) |
Merge trunk -r58900 into soc-2013-paint |
Commit Details:
Full Hash: 7beb7437cd4abc22284afab738049f83993d650a
SVN Revision: 58901
Parent Commit: dc7eeff
Lines Changed: +1280, -978
100 Modified Paths:
/intern/cycles/blender/addon/ui.py (+7, -1) (Diff)
/intern/cycles/blender/blender_session.cpp (+6, -0) (Diff)
/intern/cycles/kernel/closure/bsdf.h (+4, -0) (Diff)
/intern/cycles/kernel/kernel_accumulate.h (+29, -9) (Diff)
/intern/cycles/kernel/kernel_light.h (+1, -1) (Diff)
/intern/cycles/kernel/kernel_passes.h (+8, -0) (Diff)
/intern/cycles/kernel/kernel_path.h (+1, -1) (Diff)
/intern/cycles/kernel/kernel_shader.h (+21, -0) (Diff)
/intern/cycles/kernel/kernel_subsurface.h (+4, -0) (Diff)
/intern/cycles/kernel/kernel_types.h (+18, -5) (Diff)
/intern/cycles/kernel/svm/svm_types.h (+3, -1) (Diff)
/intern/cycles/render/film.cpp (+25, -0) (Diff)
/intern/guardedalloc/intern/mallocn.c (+4, -4) (Diff)
/intern/guardedalloc/MEM_guardedalloc.h (+7, -2) (Diff)
/intern/rigidbody/rb_bullet_api.cpp (+8, -2) (Diff)
/release/scripts/startup/bl_ui/properties_physics_dynamicpaint.py (+1, -0) (Diff)
/source/blender/blenkernel/BKE_node.h (+31, -28) (Diff)
/source/blender/blenkernel/intern/DerivedMesh.c (+3, -1) (Diff)
/source/blender/blenkernel/intern/dynamicpaint.c (+16, -4) (Diff)
/source/blender/blenkernel/intern/fmodifier.c (+4, -12) (Diff)
/source/blender/blenkernel/intern/movieclip.c (+3, -5) (Diff)
/source/blender/blenkernel/intern/navmesh_conversion.c (+0, -3) (Diff)
/source/blender/blenkernel/intern/object.c (+4, -3) (Diff)
/source/blender/blenkernel/intern/pbvh.c (+4, -18) (Diff)
/source/blender/blenkernel/intern/pointcache.c (+5, -0) (Diff)
/source/blender/blenlib/BLI_utildefines.h (+5, -2) (Diff)
/source/blender/blenlib/intern/BLI_heap.c (+4, -2) (Diff)
/source/blender/blenlib/intern/BLI_mempool.c (+12, -2) (Diff)
/source/blender/blenlib/intern/buffer.c (+6, -3) (Diff)
/source/blender/blenloader/intern/readfile.c (+46, -19) (Diff)
/source/blender/blenloader/intern/writefile.c (+28, -10) (Diff)
/source/blender/bmesh/intern/bmesh_construct.c (+1, -1) (Diff)
/source/blender/bmesh/intern/bmesh_core.c (+4, -4) (Diff)
/source/blender/bmesh/intern/bmesh_edgeloop.c (+1, -1) (Diff)
/source/blender/bmesh/intern/bmesh_operators.c (+3, -3) (Diff)
/source/blender/bmesh/intern/bmesh_polygon.c (+3, -3) (Diff)
/source/blender/bmesh/intern/bmesh_polygon.h (+2, -2) (Diff)
/source/blender/bmesh/intern/bmesh_private.h (+2, -2) (Diff)
/source/blender/bmesh/intern/bmesh_queries.c (+29, -29) (Diff)
/source/blender/bmesh/intern/bmesh_queries.h (+21, -21) (Diff)
/source/blender/bmesh/intern/bmesh_structure.c (+27, -42) (Diff)
/source/blender/bmesh/intern/bmesh_structure.h (+11, -12) (Diff)
/source/blender/bmesh/intern/bmesh_walkers.c (+4, -3) (Diff)
/source/blender/bmesh/operators/bmo_create.c (+1, -1) (Diff)
/source/blender/bmesh/operators/bmo_edgenet.c (+2, -4) (Diff)
/source/blender/bmesh/operators/bmo_join_triangles.c (+8, -5) (Diff)
/source/blender/bmesh/operators/bmo_wireframe.c (+1, -1) (Diff)
/source/blender/bmesh/tools/bmesh_decimate_dissolve.c (+202, -146) (Diff)
/source/blender/collada/MeshImporter.cpp (+2, -5) (Diff)
/source/blender/compositor/nodes/COM_RenderLayersNode.cpp (+3, -0) (Diff)
/source/blender/editors/interface/interface_layout.c (+3, -3) (Diff)
/source/blender/editors/mesh/editface.c (+42, -66) (Diff)
/source/blender/editors/mesh/editmesh_loopcut.c (+2, -2) (Diff)
/source/blender/editors/mesh/editmesh_tools.c (+3, -2) (Diff)
/source/blender/editors/mesh/editmesh_utils.c (+1, -1) (Diff)
/source/blender/editors/object/object_modifier.c (+7, -7) (Diff)
/source/blender/editors/space_logic/logic_window.c (+3, -4) (Diff)
/source/blender/editors/space_outliner/outliner_draw.c (+2, -1) (Diff)
/source/blender/editors/space_outliner/outliner_edit.c (+3, -3) (Diff)
/source/blender/editors/space_outliner/outliner_intern.h (+10, -9) (Diff)
/source/blender/editors/space_outliner/outliner_select.c (+2, -2) (Diff)
/source/blender/editors/space_outliner/outliner_tools.c (+9, -0) (Diff)
/source/blender/editors/space_outliner/outliner_tree.c (+110, -97) (Diff)
/source/blender/editors/space_outliner/space_outliner.c (+6, -3) (Diff)
/source/blender/editors/space_view3d/drawobject.c (+31, -28) (Diff)
/source/blender/editors/space_view3d/view3d_select.c (+1, -1) (Diff)
/source/blender/editors/transform/transform.c (+4, -16) (Diff)
/source/blender/makesdna/DNA_dynamicpaint_types.h (+2, -1) (Diff)
/source/blender/makesdna/DNA_outliner_types.h (+7, -2) (Diff)
/source/blender/makesdna/DNA_scene_types.h (+31, -28) (Diff)
/source/blender/makesdna/DNA_space_types.h (+4, -1) (Diff)
/source/blender/makesrna/intern/makesrna.c (+4, -3) (Diff)
/source/blender/makesrna/intern/rna_dynamicpaint.c (+5, -0) (Diff)
/source/blender/makesrna/intern/rna_gpencil.c (+3, -5) (Diff)
/source/blender/makesrna/intern/rna_object_force.c (+1, -0) (Diff)
/source/blender/makesrna/intern/rna_render.c (+3, -0) (Diff)
/source/blender/makesrna/intern/rna_scene.c (+18, -0) (Diff)
/source/blender/modifiers/intern/MOD_weightvgedit.c (+1, -1) (Diff)
/source/blender/modifiers/intern/MOD_weightvgproximity.c (+1, -1) (Diff)
/source/blender/nodes/composite/nodes/node_composite_image.c (+42, -29) (Diff)
/source/blender/render/intern/raytrace/rayobject_octree.cpp (+1, -1) (Diff)
/source/blender/render/intern/source/render_result.c (+33, -0) (Diff)
/source/gameengine/Converter/KX_BlenderSceneConverter.cpp (+1, -1) (Diff)
/source/gameengine/Ketsji/BL_ActionManager.cpp (+0, -6) (Diff)
/source/gameengine/Ketsji/KX_MeshProxy.cpp (+4, -7) (Diff)
/source/gameengine/Ketsji/KX_NavMeshObject.cpp (+7, -7) (Diff)
/source/gameengine/Ketsji/KX_ObstacleSimulation.cpp (+77, -118) (Diff)
/source/gameengine/Ketsji/KX_PolyProxy.h (+3, -3) (Diff)
/source/gameengine/Ketsji/KX_PythonInitTypes.cpp (+119, -82) (Diff)
/source/gameengine/Rasterizer/RAS_2DFilterManager.cpp (+9, -8) (Diff)
/source/gameengine/Rasterizer/RAS_2DFilterManager.h (+1, -1) (Diff)
/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_StorageIM.cpp (+1, -0) (Diff)
/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_StorageVA.cpp (+1, -0) (Diff)
/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_StorageVBO.cpp (+1, -0) (Diff)
/source/gameengine/SceneGraph/SG_Tree.cpp (+8, -1) (Diff)
/source/gameengine/VideoTexture/BlendType.h (+1, -1) (Diff)
/source/gameengine/VideoTexture/Exception.cpp (+2, -0) (Diff)
/source/gameengine/VideoTexture/FilterSource.h (+1, -1) (Diff)
/source/gameengine/VideoTexture/ImageMix.h (+1, -1) (Diff)
/source/gameengine/VideoTexture/ImageRender.cpp (+3, -1) (Diff)
/intern/cycles/blender/blender_session.cpp (+6, -0) (Diff)
/intern/cycles/kernel/closure/bsdf.h (+4, -0) (Diff)
/intern/cycles/kernel/kernel_accumulate.h (+29, -9) (Diff)
/intern/cycles/kernel/kernel_light.h (+1, -1) (Diff)
/intern/cycles/kernel/kernel_passes.h (+8, -0) (Diff)
/intern/cycles/kernel/kernel_path.h (+1, -1) (Diff)
/intern/cycles/kernel/kernel_shader.h (+21, -0) (Diff)
/intern/cycles/kernel/kernel_subsurface.h (+4, -0) (Diff)
/intern/cycles/kernel/kernel_types.h (+18, -5) (Diff)
/intern/cycles/kernel/svm/svm_types.h (+3, -1) (Diff)
/intern/cycles/render/film.cpp (+25, -0) (Diff)
/intern/guardedalloc/intern/mallocn.c (+4, -4) (Diff)
/intern/guardedalloc/MEM_guardedalloc.h (+7, -2) (Diff)
/intern/rigidbody/rb_bullet_api.cpp (+8, -2) (Diff)
/release/scripts/startup/bl_ui/properties_physics_dynamicpaint.py (+1, -0) (Diff)
/source/blender/blenkernel/BKE_node.h (+31, -28) (Diff)
/source/blender/blenkernel/intern/DerivedMesh.c (+3, -1) (Diff)
/source/blender/blenkernel/intern/dynamicpaint.c (+16, -4) (Diff)
/source/blender/blenkernel/intern/fmodifier.c (+4, -12) (Diff)
/source/blender/blenkernel/intern/movieclip.c (+3, -5) (Diff)
/source/blender/blenkernel/intern/navmesh_conversion.c (+0, -3) (Diff)
/source/blender/blenkernel/intern/object.c (+4, -3) (Diff)
/source/blender/blenkernel/intern/pbvh.c (+4, -18) (Diff)
/source/blender/blenkernel/intern/pointcache.c (+5, -0) (Diff)
/source/blender/blenlib/BLI_utildefines.h (+5, -2) (Diff)
/source/blender/blenlib/intern/BLI_heap.c (+4, -2) (Diff)
/source/blender/blenlib/intern/BLI_mempool.c (+12, -2) (Diff)
/source/blender/blenlib/intern/buffer.c (+6, -3) (Diff)
/source/blender/blenloader/intern/readfile.c (+46, -19) (Diff)
/source/blender/blenloader/intern/writefile.c (+28, -10) (Diff)
/source/blender/bmesh/intern/bmesh_construct.c (+1, -1) (Diff)
/source/blender/bmesh/intern/bmesh_core.c (+4, -4) (Diff)
/source/blender/bmesh/intern/bmesh_edgeloop.c (+1, -1) (Diff)
/source/blender/bmesh/intern/bmesh_operators.c (+3, -3) (Diff)
/source/blender/bmesh/intern/bmesh_polygon.c (+3, -3) (Diff)
/source/blender/bmesh/intern/bmesh_polygon.h (+2, -2) (Diff)
/source/blender/bmesh/intern/bmesh_private.h (+2, -2) (Diff)
/source/blender/bmesh/intern/bmesh_queries.c (+29, -29) (Diff)
/source/blender/bmesh/intern/bmesh_queries.h (+21, -21) (Diff)
/source/blender/bmesh/intern/bmesh_structure.c (+27, -42) (Diff)
/source/blender/bmesh/intern/bmesh_structure.h (+11, -12) (Diff)
/source/blender/bmesh/intern/bmesh_walkers.c (+4, -3) (Diff)
/source/blender/bmesh/operators/bmo_create.c (+1, -1) (Diff)
/source/blender/bmesh/operators/bmo_edgenet.c (+2, -4) (Diff)
/source/blender/bmesh/operators/bmo_join_triangles.c (+8, -5) (Diff)
/source/blender/bmesh/operators/bmo_wireframe.c (+1, -1) (Diff)
/source/blender/bmesh/tools/bmesh_decimate_dissolve.c (+202, -146) (Diff)
/source/blender/collada/MeshImporter.cpp (+2, -5) (Diff)
/source/blender/compositor/nodes/COM_RenderLayersNode.cpp (+3, -0) (Diff)
/source/blender/editors/interface/interface_layout.c (+3, -3) (Diff)
/source/blender/editors/mesh/editface.c (+42, -66) (Diff)
/source/blender/editors/mesh/editmesh_loopcut.c (+2, -2) (Diff)
/source/blender/editors/mesh/editmesh_tools.c (+3, -2) (Diff)
/source/blender/editors/mesh/editmesh_utils.c (+1, -1) (Diff)
/source/blender/editors/object/object_modifier.c (+7, -7) (Diff)
/source/blender/editors/space_logic/logic_window.c (+3, -4) (Diff)
/source/blender/editors/space_outliner/outliner_draw.c (+2, -1) (Diff)
/source/blender/editors/space_outliner/outliner_edit.c (+3, -3) (Diff)
/source/blender/editors/space_outliner/outliner_intern.h (+10, -9) (Diff)
/source/blender/editors/space_outliner/outliner_select.c (+2, -2) (Diff)
/source/blender/editors/space_outliner/outliner_tools.c (+9, -0) (Diff)
/source/blender/editors/space_outliner/outliner_tree.c (+110, -97) (Diff)
/source/blender/editors/space_outliner/space_outliner.c (+6, -3) (Diff)
/source/blender/editors/space_view3d/drawobject.c (+31, -28) (Diff)
/source/blender/editors/space_view3d/view3d_select.c (+1, -1) (Diff)
/source/blender/editors/transform/transform.c (+4, -16) (Diff)
/source/blender/makesdna/DNA_dynamicpaint_types.h (+2, -1) (Diff)
/source/blender/makesdna/DNA_outliner_types.h (+7, -2) (Diff)
/source/blender/makesdna/DNA_scene_types.h (+31, -28) (Diff)
/source/blender/makesdna/DNA_space_types.h (+4, -1) (Diff)
/source/blender/makesrna/intern/makesrna.c (+4, -3) (Diff)
/source/blender/makesrna/intern/rna_dynamicpaint.c (+5, -0) (Diff)
/source/blender/makesrna/intern/rna_gpencil.c (+3, -5) (Diff)
/source/blender/makesrna/intern/rna_object_force.c (+1, -0) (Diff)
/source/blender/makesrna/intern/rna_render.c (+3, -0) (Diff)
/source/blender/makesrna/intern/rna_scene.c (+18, -0) (Diff)
/source/blender/modifiers/intern/MOD_weightvgedit.c (+1, -1) (Diff)
/source/blender/modifiers/intern/MOD_weightvgproximity.c (+1, -1) (Diff)
/source/blender/nodes/composite/nodes/node_composite_image.c (+42, -29) (Diff)
/source/blender/render/intern/raytrace/rayobject_octree.cpp (+1, -1) (Diff)
/source/blender/render/intern/source/render_result.c (+33, -0) (Diff)
/source/gameengine/Converter/KX_BlenderSceneConverter.cpp (+1, -1) (Diff)
/source/gameengine/Ketsji/BL_ActionManager.cpp (+0, -6) (Diff)
/source/gameengine/Ketsji/KX_MeshProxy.cpp (+4, -7) (Diff)
/source/gameengine/Ketsji/KX_NavMeshObject.cpp (+7, -7) (Diff)
/source/gameengine/Ketsji/KX_ObstacleSimulation.cpp (+77, -118) (Diff)
/source/gameengine/Ketsji/KX_PolyProxy.h (+3, -3) (Diff)
/source/gameengine/Ketsji/KX_PythonInitTypes.cpp (+119, -82) (Diff)
/source/gameengine/Rasterizer/RAS_2DFilterManager.cpp (+9, -8) (Diff)
/source/gameengine/Rasterizer/RAS_2DFilterManager.h (+1, -1) (Diff)
/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_StorageIM.cpp (+1, -0) (Diff)
/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_StorageVA.cpp (+1, -0) (Diff)
/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_StorageVBO.cpp (+1, -0) (Diff)
/source/gameengine/SceneGraph/SG_Tree.cpp (+8, -1) (Diff)
/source/gameengine/VideoTexture/BlendType.h (+1, -1) (Diff)
/source/gameengine/VideoTexture/Exception.cpp (+2, -0) (Diff)
/source/gameengine/VideoTexture/FilterSource.h (+1, -1) (Diff)
/source/gameengine/VideoTexture/ImageMix.h (+1, -1) (Diff)
/source/gameengine/VideoTexture/ImageRender.cpp (+3, -1) (Diff)