Blender Git Loki
Git Commits -> Revision a1f8706
Revision a1f8706 by Joshua Leung (master) December 13, 2015, 08:03 (GMT) |
Grease Pencil: Merge GPencil_Editing_Stage3 branch into master This commit merges all the work done in the GPencil_Editing_Stage3 branch as of ef2aecf2db981b5344e0d14e7f074f1742b0b2f7 into master. For more details about the changes that this brings, see the WIP release notes: http://wiki.blender.org/index.php/Dev:Ref/Release_Notes/2.77/GPencil |
Commit Details:
Full Hash: a1f87064c4c0cd9e8eafc19c599c4ad4ccdba49f
Parent Commit: d9ee88d
Lines Changed: +4324, -638
1 Added Path:
/source/blender/editors/gpencil/gpencil_brush.c (+1691, -0) (View)
53 Modified Paths:
/release/scripts/startup/bl_ui/properties_grease_pencil_common.py (+223, -69) (Diff)
/release/scripts/startup/bl_ui/space_clip.py (+5, -0) (Diff)
/release/scripts/startup/bl_ui/space_dopesheet.py (+13, -0) (Diff)
/release/scripts/startup/bl_ui/space_image.py (+6, -0) (Diff)
/release/scripts/startup/bl_ui/space_node.py (+6, -0) (Diff)
/release/scripts/startup/bl_ui/space_view3d.py (+114, -3) (Diff)
/release/scripts/startup/bl_ui/space_view3d_toolbar.py (+7, -1) (Diff)
/source/blender/blenkernel/BKE_gpencil.h (+17, -1) (Diff)
/source/blender/blenkernel/intern/gpencil.c (+68, -2) (Diff)
/source/blender/blenkernel/intern/scene.c (+47, -0) (Diff)
/source/blender/blenloader/intern/readfile.c (+1, -0) (Diff)
/source/blender/blenloader/intern/versioning_270.c (+78, -1) (Diff)
/source/blender/blenloader/intern/versioning_defaults.c (+45, -0) (Diff)
/source/blender/editors/animation/anim_draw.c (+4, -4) (Diff)
/source/blender/editors/animation/anim_filter.c (+110, -36) (Diff)
/source/blender/editors/animation/keyframes_general.c (+1, -1) (Diff)
/source/blender/editors/gpencil/CMakeLists.txt (+1, -0) (Diff)
/source/blender/editors/gpencil/drawgpencil.c (+19, -6) (Diff)
/source/blender/editors/gpencil/editaction_gpencil.c (+120, -119) (Diff)
/source/blender/editors/gpencil/gpencil_convert.c (+4, -3) (Diff)
/source/blender/editors/gpencil/gpencil_data.c (+218, -0) (Diff)
/source/blender/editors/gpencil/gpencil_edit.c (+462, -84) (Diff)
/source/blender/editors/gpencil/gpencil_intern.h (+49, -0) (Diff)
/source/blender/editors/gpencil/gpencil_ops.c (+80, -13) (Diff)
/source/blender/editors/gpencil/gpencil_paint.c (+238, -185) (Diff)
/source/blender/editors/gpencil/gpencil_select.c (+8, -3) (Diff)
/source/blender/editors/gpencil/gpencil_utils.c (+160, -2) (Diff)
/source/blender/editors/include/ED_gpencil.h (+9, -5) (Diff)
/source/blender/editors/object/object_edit.c (+48, -2) (Diff)
/source/blender/editors/screen/screen_ops.c (+4, -4) (Diff)
/source/blender/editors/space_action/action_edit.c (+11, -4) (Diff)
/source/blender/editors/space_time/space_time.c (+7, -5) (Diff)
/source/blender/editors/space_view3d/view3d_draw.c (+12, -6) (Diff)
/source/blender/editors/space_view3d/view3d_header.c (+6, -1) (Diff)
/source/blender/editors/transform/transform_conversions.c (+3, -40) (Diff)
/source/blender/editors/transform/transform_generics.c (+7, -0) (Diff)
/source/blender/editors/transform/transform_manipulator.c (+36, -5) (Diff)
/source/blender/makesdna/DNA_action_types.h (+3, -0) (Diff)
/source/blender/makesdna/DNA_gpencil_types.h (+10, -2) (Diff)
/source/blender/makesdna/DNA_object_types.h (+1, -0) (Diff)
/source/blender/makesdna/DNA_scene_types.h (+94, -2) (Diff)
/source/blender/makesrna/intern/rna_action.c (+8, -0) (Diff)
/source/blender/makesrna/intern/rna_gpencil.c (+69, -22) (Diff)
/source/blender/makesrna/intern/rna_object.c (+1, -0) (Diff)
/source/blender/makesrna/intern/rna_scene.c (+59, -5) (Diff)
/source/blender/makesrna/intern/rna_sculpt_paint.c (+105, -0) (Diff)
/source/blender/makesrna/intern/rna_wm.c (+6, -0) (Diff)
/source/blender/makesrna/RNA_access.h (+2, -0) (Diff)
/source/blender/makesrna/RNA_enum_types.h (+2, -0) (Diff)
/source/blender/windowmanager/intern/wm_event_system.c (+18, -2) (Diff)
/source/blender/windowmanager/intern/wm_init_exit.c (+1, -0) (Diff)
/source/blender/windowmanager/intern/wm_keymap.c (+3, -0) (Diff)
/source/blender/windowmanager/wm_event_types.h (+4, -0) (Diff)
/release/scripts/startup/bl_ui/space_clip.py (+5, -0) (Diff)
/release/scripts/startup/bl_ui/space_dopesheet.py (+13, -0) (Diff)
/release/scripts/startup/bl_ui/space_image.py (+6, -0) (Diff)
/release/scripts/startup/bl_ui/space_node.py (+6, -0) (Diff)
/release/scripts/startup/bl_ui/space_view3d.py (+114, -3) (Diff)
/release/scripts/startup/bl_ui/space_view3d_toolbar.py (+7, -1) (Diff)
/source/blender/blenkernel/BKE_gpencil.h (+17, -1) (Diff)
/source/blender/blenkernel/intern/gpencil.c (+68, -2) (Diff)
/source/blender/blenkernel/intern/scene.c (+47, -0) (Diff)
/source/blender/blenloader/intern/readfile.c (+1, -0) (Diff)
/source/blender/blenloader/intern/versioning_270.c (+78, -1) (Diff)
/source/blender/blenloader/intern/versioning_defaults.c (+45, -0) (Diff)
/source/blender/editors/animation/anim_draw.c (+4, -4) (Diff)
/source/blender/editors/animation/anim_filter.c (+110, -36) (Diff)
/source/blender/editors/animation/keyframes_general.c (+1, -1) (Diff)
/source/blender/editors/gpencil/CMakeLists.txt (+1, -0) (Diff)
/source/blender/editors/gpencil/drawgpencil.c (+19, -6) (Diff)
/source/blender/editors/gpencil/editaction_gpencil.c (+120, -119) (Diff)
/source/blender/editors/gpencil/gpencil_convert.c (+4, -3) (Diff)
/source/blender/editors/gpencil/gpencil_data.c (+218, -0) (Diff)
/source/blender/editors/gpencil/gpencil_edit.c (+462, -84) (Diff)
/source/blender/editors/gpencil/gpencil_intern.h (+49, -0) (Diff)
/source/blender/editors/gpencil/gpencil_ops.c (+80, -13) (Diff)
/source/blender/editors/gpencil/gpencil_paint.c (+238, -185) (Diff)
/source/blender/editors/gpencil/gpencil_select.c (+8, -3) (Diff)
/source/blender/editors/gpencil/gpencil_utils.c (+160, -2) (Diff)
/source/blender/editors/include/ED_gpencil.h (+9, -5) (Diff)
/source/blender/editors/object/object_edit.c (+48, -2) (Diff)
/source/blender/editors/screen/screen_ops.c (+4, -4) (Diff)
/source/blender/editors/space_action/action_edit.c (+11, -4) (Diff)
/source/blender/editors/space_time/space_time.c (+7, -5) (Diff)
/source/blender/editors/space_view3d/view3d_draw.c (+12, -6) (Diff)
/source/blender/editors/space_view3d/view3d_header.c (+6, -1) (Diff)
/source/blender/editors/transform/transform_conversions.c (+3, -40) (Diff)
/source/blender/editors/transform/transform_generics.c (+7, -0) (Diff)
/source/blender/editors/transform/transform_manipulator.c (+36, -5) (Diff)
/source/blender/makesdna/DNA_action_types.h (+3, -0) (Diff)
/source/blender/makesdna/DNA_gpencil_types.h (+10, -2) (Diff)
/source/blender/makesdna/DNA_object_types.h (+1, -0) (Diff)
/source/blender/makesdna/DNA_scene_types.h (+94, -2) (Diff)
/source/blender/makesrna/intern/rna_action.c (+8, -0) (Diff)
/source/blender/makesrna/intern/rna_gpencil.c (+69, -22) (Diff)
/source/blender/makesrna/intern/rna_object.c (+1, -0) (Diff)
/source/blender/makesrna/intern/rna_scene.c (+59, -5) (Diff)
/source/blender/makesrna/intern/rna_sculpt_paint.c (+105, -0) (Diff)
/source/blender/makesrna/intern/rna_wm.c (+6, -0) (Diff)
/source/blender/makesrna/RNA_access.h (+2, -0) (Diff)
/source/blender/makesrna/RNA_enum_types.h (+2, -0) (Diff)
/source/blender/windowmanager/intern/wm_event_system.c (+18, -2) (Diff)
/source/blender/windowmanager/intern/wm_init_exit.c (+1, -0) (Diff)
/source/blender/windowmanager/intern/wm_keymap.c (+3, -0) (Diff)
/source/blender/windowmanager/wm_event_types.h (+4, -0) (Diff)