Blender Git Loki
Git Commits -> Revision 9711a00
Revision 9711a00 by Campbell Barton May 19, 2013, 12:26 (GMT) |
svn merge ^/trunk/blender -c56892 -c56894 -c56896 -c56897 -c56898 -c56901 -c56902 -c56905 -c56906 -c56912 |
Commit Details:
Full Hash: 9711a0034fc1d508e4e49b7cc991c377789a4499
SVN Revision: 56913
Parent Commit: 9da1a40
Lines Changed: +90, -36
14 Modified Paths:
/intern/ghost/intern/GHOST_WindowWin32.cpp (+4, -0) (Diff)
/intern/ghost/intern/GHOST_WindowX11.cpp (+2, -0) (Diff)
/source/blender/editors/animation/anim_draw.c (+3, -3) (Diff)
/source/blender/editors/include/ED_anim_api.h (+1, -1) (Diff)
/source/blender/editors/sculpt_paint/paint_cursor.c (+1, -1) (Diff)
/source/blender/editors/sculpt_paint/paint_stroke.c (+30, -24) (Diff)
/source/blender/editors/space_action/space_action.c (+1, -1) (Diff)
/source/blender/editors/space_graph/space_graph.c (+1, -1) (Diff)
/source/blender/editors/space_nla/space_nla.c (+1, -1) (Diff)
/source/blender/editors/space_sequencer/sequencer_draw.c (+2, -2) (Diff)
/source/blender/freestyle/intern/system/RenderMonitor.h (+15, -0) (Diff)
/source/blender/freestyle/intern/view_map/AverageAreaGridDensityProvider.cpp (+7, -0) (Diff)
/source/blender/freestyle/intern/view_map/ViewMapBuilder.cpp (+20, -2) (Diff)
/source/gameengine/Converter/BL_ActionActuator.cpp (+2, -0) (Diff)
/intern/ghost/intern/GHOST_WindowX11.cpp (+2, -0) (Diff)
/source/blender/editors/animation/anim_draw.c (+3, -3) (Diff)
/source/blender/editors/include/ED_anim_api.h (+1, -1) (Diff)
/source/blender/editors/sculpt_paint/paint_cursor.c (+1, -1) (Diff)
/source/blender/editors/sculpt_paint/paint_stroke.c (+30, -24) (Diff)
/source/blender/editors/space_action/space_action.c (+1, -1) (Diff)
/source/blender/editors/space_graph/space_graph.c (+1, -1) (Diff)
/source/blender/editors/space_nla/space_nla.c (+1, -1) (Diff)
/source/blender/editors/space_sequencer/sequencer_draw.c (+2, -2) (Diff)
/source/blender/freestyle/intern/system/RenderMonitor.h (+15, -0) (Diff)
/source/blender/freestyle/intern/view_map/AverageAreaGridDensityProvider.cpp (+7, -0) (Diff)
/source/blender/freestyle/intern/view_map/ViewMapBuilder.cpp (+20, -2) (Diff)
/source/gameengine/Converter/BL_ActionActuator.cpp (+2, -0) (Diff)