Blender Git Loki
Git Commits -> Revision 880cb4c
Revision 880cb4c by Jason Wilkins (soc-2010-jwilkins) May 28, 2011, 10:01 (GMT) |
!!Merge Complete!! Compiles, cursory testing of on-surface brush, matcaps, and new texture mode. Known Issue: new radial control does not seem to work with f-key resizing when 'lock size' is enabled. Need to check that this is not bug in trunk as well. |
Commit Details:
Full Hash: 880cb4cd3b569e269732a6b99436d3b7be8b0ee5
SVN Revision: 36973
Parent Commit: c6c1a6a
Lines Changed: +184, -162
18 Modified Paths:
/CMakeLists.txt (+4, -7) (Diff)
/intern/ghost/intern/GHOST_WindowWin32.cpp (+0, -1) (Diff)
/release/scripts/startup/bl_ui/space_view3d.py (+15, -0) (Diff)
/release/scripts/startup/bl_ui/space_view3d_toolbar.py (+44, -41) (Diff)
/source/blender/blenkernel/BKE_blender.h (+1, -1) (Diff)
/source/blender/blenkernel/BKE_main.h (+1, -1) (Diff)
/source/blender/blenkernel/intern/material.c (+9, -4) (Diff)
/source/blender/blenkernel/intern/paint.c (+1, -1) (Diff)
/source/blender/blenloader/intern/readfile.c (+6, -8) (Diff)
/source/blender/editors/sculpt_paint/paint_stroke.c (+54, -46) (Diff)
/source/blender/editors/sculpt_paint/sculpt.c (+35, -36) (Diff)
/source/blender/editors/sculpt_paint/sculpt_intern.h (+1, -1) (Diff)
/source/blender/editors/sculpt_paint/sculpt_undo.c (+1, -1) (Diff)
/source/blender/editors/space_view3d/view3d_draw.c (+3, -10) (Diff)
/source/blender/gpu/intern/gpu_draw.c (+1, -2) (Diff)
/source/blender/makesdna/DNA_userdef_types.h (+3, -2) (Diff)
/source/blender/makesrna/intern/rna_sculpt_paint.c (+2, -0) (Diff)
/source/blender/makesrna/intern/rna_space.c (+3, -0) (Diff)
/intern/ghost/intern/GHOST_WindowWin32.cpp (+0, -1) (Diff)
/release/scripts/startup/bl_ui/space_view3d.py (+15, -0) (Diff)
/release/scripts/startup/bl_ui/space_view3d_toolbar.py (+44, -41) (Diff)
/source/blender/blenkernel/BKE_blender.h (+1, -1) (Diff)
/source/blender/blenkernel/BKE_main.h (+1, -1) (Diff)
/source/blender/blenkernel/intern/material.c (+9, -4) (Diff)
/source/blender/blenkernel/intern/paint.c (+1, -1) (Diff)
/source/blender/blenloader/intern/readfile.c (+6, -8) (Diff)
/source/blender/editors/sculpt_paint/paint_stroke.c (+54, -46) (Diff)
/source/blender/editors/sculpt_paint/sculpt.c (+35, -36) (Diff)
/source/blender/editors/sculpt_paint/sculpt_intern.h (+1, -1) (Diff)
/source/blender/editors/sculpt_paint/sculpt_undo.c (+1, -1) (Diff)
/source/blender/editors/space_view3d/view3d_draw.c (+3, -10) (Diff)
/source/blender/gpu/intern/gpu_draw.c (+1, -2) (Diff)
/source/blender/makesdna/DNA_userdef_types.h (+3, -2) (Diff)
/source/blender/makesrna/intern/rna_sculpt_paint.c (+2, -0) (Diff)
/source/blender/makesrna/intern/rna_space.c (+3, -0) (Diff)