Blender Git Loki

Git Commits -> Revision 9ac31ad

Revision 9ac31ad by Campbell Barton
March 4, 2013, 12:39 (GMT)
svn merge ^/trunk/blender -c54733 -c54738 -c54745 -c54746 -c54748 -c54754 -c54757 -c54760 -c54764 -c54766 -c54767 -c54769 -c54772 -c54776 -c54777 -c54780 -c54781 -c54782 -c54783 -c54788 -c54789 -c54790 -c54793 -c54794 -c54799 -c54816 -c54818 -c54822 -c54824 -c54827 -c54828 -c54833 -c54834 -c54835 -c54837 -c54855 -c54856 -c54862 -c54865 -c54866 -c54868 -c54875 -c54877 -c54878 -c54879 -c54882 -c54883 -c54885 -c54891 -c54899 -c54900 -c54901 -c54903 -c54907 -c54908 -c54910 -c54912 -c54917 -c54920 -c54921 -c54923 -c54928 -c54934 -c54935 -c54942 -c54943 -c54944 -c54945 -c54946 -c54948 -c54954 -c54959 -c54960 -c54961 -c54965 -c54971 -c54972 -c54990 -c54991 -c54993 -c54996 -c55004 -c55007 -c55010 -c55011 -c55012

Commit Details:

Full Hash: 9ac31ad6470f85c08ae7d218df5670ce751a014c
SVN Revision: 55016
Parent Commit: 2605dd2
Lines Changed: +1382, -1267

2 Deleted Paths:

/source/gameengine/Converter/KX_IpoConvert.cpp (+0, -484)
/source/gameengine/Converter/KX_IpoConvert.h (+0, -69)

102 Modified Paths:

/intern/cycles/blender/blender_object.cpp (+43, -51) (Diff)
/intern/cycles/render/object.cpp (+2, -2) (Diff)
/intern/ghost/intern/GHOST_SystemWin32.cpp (+2, -2) (Diff)
/intern/ghost/intern/GHOST_WindowCocoa.mm (+5, -0) (Diff)
/intern/ghost/intern/GHOST_WindowWin32.cpp (+4, -0) (Diff)
/intern/ghost/intern/GHOST_WindowX11.cpp (+1, -0) (Diff)
/release/scripts/modules/bpy_extras/keyconfig_utils.py (+29, -8) (Diff)
/release/scripts/modules/console/intellisense.py (+1, -1) (Diff)
/release/scripts/startup/bl_operators/object.py (+1, -4) (Diff)
/release/scripts/startup/bl_operators/wm.py (+27, -10) (Diff)
/release/scripts/startup/bl_ui/space_view3d.py (+38, -7) (Diff)
/release/scripts/templates_py/operator_modal_timer.py (+1, -1) (Diff)
/source/blender/blenkernel/BKE_report.h (+2, -0) (Diff)
/source/blender/blenkernel/BKE_rigidbody.h (+1, -0) (Diff)
/source/blender/blenkernel/BKE_sequencer.h (+3, -0) (Diff)
/source/blender/blenkernel/intern/anim.c (+30, -32) (Diff)
/source/blender/blenkernel/intern/DerivedMesh.c (+5, -3) (Diff)
/source/blender/blenkernel/intern/editderivedmesh.c (+83, -69) (Diff)
/source/blender/blenkernel/intern/mask.c (+2, -0) (Diff)
/source/blender/blenkernel/intern/mesh.c (+11, -9) (Diff)
/source/blender/blenkernel/intern/movieclip.c (+16, -0) (Diff)
/source/blender/blenkernel/intern/node.c (+7, -0) (Diff)
/source/blender/blenkernel/intern/object.c (+3, -0) (Diff)
/source/blender/blenkernel/intern/pbvh_bmesh.c (+1, -1) (Diff)
/source/blender/blenkernel/intern/rigidbody.c (+27, -15) (Diff)
/source/blender/blenkernel/intern/scene.c (+24, -24) (Diff)
/source/blender/blenkernel/intern/seqmodifier.c (+4, -4) (Diff)
/source/blender/blenkernel/intern/sequencer.c (+32, -2) (Diff)
/source/blender/blenkernel/intern/text.c (+1, -0) (Diff)
/source/blender/blenloader/intern/readfile.c (+32, -2) (Diff)
/source/blender/collada/ControllerExporter.cpp (+17, -5) (Diff)
/source/blender/compositor/nodes/COM_ImageNode.cpp (+11, -1) (Diff)
/source/blender/editors/include/ED_view3d.h (+9, -5) (Diff)
/source/blender/editors/include/UI_interface.h (+1, -0) (Diff)
/source/blender/editors/interface/interface_handlers.c (+4, -4) (Diff)
/source/blender/editors/interface/interface_templates.c (+3, -3) (Diff)
/source/blender/editors/interface/interface_widgets.c (+1, -1) (Diff)
/source/blender/editors/interface/resources.c (+2, -0) (Diff)
/source/blender/editors/interface/view2d_ops.c (+3, -2) (Diff)
/source/blender/editors/mesh/editface.c (+10, -4) (Diff)
/source/blender/editors/mesh/editmesh_select.c (+28, -16) (Diff)
/source/blender/editors/mesh/meshtools.c (+5, -1) (Diff)
/source/blender/editors/object/object_add.c (+1, -0) (Diff)
/source/blender/editors/object/object_modifier.c (+2, -0) (Diff)
/source/blender/editors/physics/physics_pointcache.c (+16, -10) (Diff)
/source/blender/editors/screen/area.c (+5, -3) (Diff)
/source/blender/editors/screen/screendump.c (+12, -4) (Diff)
/source/blender/editors/screen/screen_ops.c (+4, -4) (Diff)
/source/blender/editors/sculpt_paint/paint_intern.h (+0, -2) (Diff)
/source/blender/editors/sculpt_paint/paint_ops.c (+4, -4) (Diff)
/source/blender/editors/sculpt_paint/paint_utils.c (+2, -42) (Diff)
/source/blender/editors/sculpt_paint/paint_vertex.c (+2, -1) (Diff)
/source/blender/editors/sculpt_paint/sculpt.c (+1, -1) (Diff)
/source/blender/editors/space_clip/clip_buttons.c (+6, -6) (Diff)
/source/blender/editors/space_image/image_intern.h (+0, -2) (Diff)
/source/blender/editors/space_image/image_ops.c (+3, -0) (Diff)
/source/blender/editors/space_image/space_image.c (+0, -2) (Diff)
/source/blender/editors/space_node/drawnode.c (+5, -2) (Diff)
/source/blender/editors/space_outliner/outliner_tools.c (+1, -1) (Diff)
/source/blender/editors/space_text/text_format.c (+1, -1) (Diff)
/source/blender/editors/space_view3d/view3d_project.c (+22, -14) (Diff)
/source/blender/editors/transform/transform.c (+22, -5) (Diff)
/source/blender/editors/transform/transform.h (+3, -0) (Diff)
/source/blender/editors/transform/transform_conversions.c (+1, -1) (Diff)
/source/blender/editors/transform/transform_manipulator.c (+207, -103) (Diff)
/source/blender/editors/uvedit/uvedit_ops.c (+11, -11) (Diff)
/source/blender/imbuf/intern/jp2.c (+174, -45) (Diff)
/source/blender/imbuf/intern/png.c (+76, -18) (Diff)
/source/blender/makesdna/DNA_node_types.h (+3, -0) (Diff)
/source/blender/makesdna/DNA_rigidbody_types.h (+1, -3) (Diff)
/source/blender/makesrna/intern/rna_access.c (+4, -6) (Diff)
/source/blender/makesrna/intern/rna_image.c (+0, -1) (Diff)
/source/blender/makesrna/intern/rna_nodetree.c (+6, -1) (Diff)
/source/blender/makesrna/intern/rna_rigidbody.c (+15, -0) (Diff)
/source/blender/makesrna/intern/rna_scene.c (+3, -6) (Diff)
/source/blender/modifiers/intern/MOD_shrinkwrap.c (+10, -1) (Diff)
/source/blender/modifiers/intern/MOD_solidify.c (+5, -0) (Diff)
/source/blender/modifiers/intern/MOD_subsurf.c (+1, -0) (Diff)
/source/blender/nodes/intern/node_exec.c (+3, -2) (Diff)
/source/blender/python/intern/bpy_rna.c (+26, -7) (Diff)
/source/blender/render/intern/source/multires_bake.c (+2, -2) (Diff)
/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp (+1, -1) (Diff)
/source/gameengine/Converter/BL_BlenderDataConversion.cpp (+58, -37) (Diff)
/source/gameengine/Converter/CMakeLists.txt (+0, -2) (Diff)
/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp (+4, -0) (Diff)
/source/gameengine/Ketsji/BL_Action.cpp (+63, -21) (Diff)
/source/gameengine/Ketsji/BL_BlenderShader.cpp (+2, -2) (Diff)
/source/gameengine/Ketsji/CMakeLists.txt (+2, -0) (Diff)
/source/gameengine/Ketsji/KX_ObColorIpoSGController.cpp (+4, -7) (Diff)
/source/gameengine/Ketsji/KX_ObjectActuator.cpp (+8, -4) (Diff)
/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp (+1, -9) (Diff)
/source/gameengine/Rasterizer/RAS_2DFilterManager.cpp (+5, -1) (Diff)
/source/gameengine/Rasterizer/RAS_IRasterizer.h (+1, -1) (Diff)
/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp (+12, -7) (Diff)
/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.h (+2, -1) (Diff)
/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_StorageIM.cpp (+4, -4) (Diff)
/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_StorageIM.h (+2, -1) (Diff)
/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_StorageVA.cpp (+4, -4) (Diff)
/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_StorageVA.h (+2, -1) (Diff)
/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_StorageVBO.cpp (+8, -9) (Diff)
/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_StorageVBO.h (+3, -2) (Diff)
/source/tests/CMakeLists.txt (+4, -0) (Diff)
Tehnyt: Miika HämäläinenViimeksi päivitetty: 07.11.2014 14:18MiikaH:n Sivut a.k.a. MiikaHweb | 2003-2021