Blender Git Loki
Git Commits -> Revision 1b13fda
Revision 1b13fda by Joshua Leung (greasepencil-experimental, greasepencil-object, greasepencil-refactor, soc-2019-npr, temp-gpencil-eval, temp-greasepencil-vfx) June 29, 2018, 14:52 (GMT) |
Annotations: Restore 3D View support for annotations (WIP) Initial support for getting annotations to show up in the 3D viewport again. WIP and slightly hacky, but it restores basic working functionality so we can focus on polishing the "new" parts. Ultimately, the way these callbacks are integrated into the drawing loop will probably need to change. For example, * Perhaps we might need a full overlay engine for this one case (as for motionpaths), though that may also be overkill, and would further split the code in different places. * The draw order (relative to manipulators) needs review. It probably should be below both sets of manipulators, not sandwiched between them. Other notes: * For this to work, we currently need to use the original (non-evaluated) scene data, or else we don't get the newly drawn strokes, as the scene->gpd stuff isn't copied by COW yet. |
Commit Details:
Full Hash: 1b13fdaf80e938664c712c01dd7dfa8e7bdb6956
Parent Commit: e262683
Lines Changed: +48, -13
5 Modified Paths:
/release/scripts/startup/bl_ui/space_view3d.py (+10, -0) (Diff)
/source/blender/draw/intern/draw_manager.c (+24, -0) (Diff)
/source/blender/editors/gpencil/annotate_draw.c (+9, -10) (Diff)
/source/blender/editors/include/ED_gpencil.h (+4, -0) (Diff)
/source/blender/makesrna/intern/rna_scene.c (+1, -3) (Diff)
/source/blender/draw/intern/draw_manager.c (+24, -0) (Diff)
/source/blender/editors/gpencil/annotate_draw.c (+9, -10) (Diff)
/source/blender/editors/include/ED_gpencil.h (+4, -0) (Diff)
/source/blender/makesrna/intern/rna_scene.c (+1, -3) (Diff)