Blender Git Loki
Git Commits -> Revision 6df2bed
Revision 6df2bed by Joshua Leung (greasepencil-experimental, greasepencil-object, greasepencil-refactor, soc-2019-npr, temp-gpencil-eval, temp-greasepencil-vfx) June 28, 2018, 07:13 (GMT) |
Annotations: First steps towards having working annotations again Copy-back (from 2.8) and split out "Annotations" drawing operator/rendering code from the "GP Object" versions of the same code. Notes: * All "annotation" related things are now in the annotate_*.c files, while "drawgpencil.c" and "gpencil_paint.c" are for the GP Object only now. This will simplify maintenance of the two different usecases, as the GP Object versions are significantly more complicated and filled with extra cruft. * The general "Grease Pencil" keymap (i.e. the one that allows DKEY+LMB-drag to draw) is now for annotation usage only. For GP Objects, you can add a blank GP Object, enter Draw Mode, and start drawing. Code Changes: * Removed all 2D drawing-code entrypoints from drawgpencil.c * Cleaned up most of the annotate_paint.c and annotate_draw.c code to remove stuff that annotations won't use (e.g. brushes, palettes, fancy line effects, etc.) As much as possible, these have been restored back to a pre 2.77 state - with the notable exception of per-layer Onion Skinning, for which the settings were removed already. |
Commit Details:
Full Hash: 6df2bed1e9377278c09021397a5475d22945c644
Parent Commit: f3c4220
Lines Changed: +3601, -232
2 Added Paths:
/source/blender/editors/gpencil/annotate_draw.c (+1121, -0) (View)
/source/blender/editors/gpencil/annotate_paint.c (+2463, -0) (View)
/source/blender/editors/gpencil/annotate_paint.c (+2463, -0) (View)
5 Modified Paths:
/source/blender/editors/gpencil/CMakeLists.txt (+2, -0) (Diff)
/source/blender/editors/gpencil/drawgpencil.c (+0, -226) (Diff)
/source/blender/editors/gpencil/gpencil_intern.h (+5, -0) (Diff)
/source/blender/editors/gpencil/gpencil_ops.c (+8, -4) (Diff)
/source/blender/makesdna/DNA_scene_types.h (+2, -2) (Diff)
/source/blender/editors/gpencil/drawgpencil.c (+0, -226) (Diff)
/source/blender/editors/gpencil/gpencil_intern.h (+5, -0) (Diff)
/source/blender/editors/gpencil/gpencil_ops.c (+8, -4) (Diff)
/source/blender/makesdna/DNA_scene_types.h (+2, -2) (Diff)