Revision 02b3e81 by Nick Wu (greasepencil-object, greasepencil-refactor, soc-2018-npr, soc-2019-npr, temp-gpencil-eval) June 29, 2018, 04:03 (GMT) |
Merge remote-tracking branch 'remotes/origin/blender2.8' into soc-2018-npr |
Revision 141c2cf by Nick Wu (greasepencil-object, greasepencil-refactor, soc-2018-npr, soc-2019-npr, temp-gpencil-eval) June 29, 2018, 04:01 (GMT) |
Multisample implementing, f 12 won't work either. |
Revision f19b34b by Antonio Vazquez (greasepencil-experimental, greasepencil-object, greasepencil-refactor, soc-2019-npr, temp-gpencil-eval, temp-greasepencil-vfx) June 28, 2018, 15:45 (GMT) |
UI: Rename Grease Pencil Simplify Panel |
Revision 824ef92 by Antonio Vazquez (greasepencil-experimental, greasepencil-object, greasepencil-refactor, soc-2019-npr, temp-gpencil-eval, temp-greasepencil-vfx) June 28, 2018, 15:44 (GMT) |
Fix merge errors |
Revision 823bb18 by Antonio Vazquez (greasepencil-experimental, greasepencil-object, greasepencil-refactor, soc-2019-npr, temp-gpencil-eval, temp-greasepencil-vfx) June 28, 2018, 15:33 (GMT) |
Merge branch 'blender2.8' into greasepencil-object Conflicts: release/datafiles/userdef/userdef_default_theme.c release/scripts/startup/bl_ui/properties_scene.py source/blender/editors/gpencil/drawgpencil.c source/blender/editors/gpencil/gpencil_brush.c source/blender/editors/gpencil/gpencil_paint.c |
Revision 23ffb56 by Antonio Vazquez (greasepencil-experimental, greasepencil-object, greasepencil-refactor, soc-2019-npr, temp-gpencil-eval, temp-greasepencil-vfx) June 28, 2018, 15:25 (GMT) |
Move GPD runtime fields to runtime struct |
Revision 0065c90 by Nick Wu (greasepencil-object, greasepencil-refactor, soc-2018-npr, soc-2019-npr, temp-gpencil-eval) June 28, 2018, 14:55 (GMT) |
remove linear depth conversion. now clipping finally works as expected. |
Revision e97f357 by Joshua Leung (greasepencil-experimental, greasepencil-object, greasepencil-refactor, soc-2019-npr, temp-gpencil-eval, temp-greasepencil-vfx) June 28, 2018, 14:48 (GMT) |
Annotations: Set better default name for new annotation layers Note: Many of the add layer operators still need tweaks, but this is a good start for the main ones. |
Revision 8869939 by Joshua Leung (greasepencil-experimental, greasepencil-object, greasepencil-refactor, soc-2019-npr, temp-gpencil-eval, temp-greasepencil-vfx) June 28, 2018, 14:29 (GMT) |
Annotations: Restore color selector per layer This shows up in the layer list, making it possible to quickly change it inline, and to see what color the strokes in the layer are using. |
Revision 630d1ac by Joshua Leung (greasepencil-experimental, greasepencil-object, greasepencil-refactor, soc-2019-npr, temp-gpencil-eval, temp-greasepencil-vfx) June 28, 2018, 09:32 (GMT) |
GP/Annotations: Provide usage hints about the "Poly" tool |
Revision bfae260 by Joshua Leung (greasepencil-experimental, greasepencil-object, greasepencil-refactor, soc-2019-npr, temp-gpencil-eval, temp-greasepencil-vfx) June 28, 2018, 09:27 (GMT) |
Annotations: Don't respect the "on back" option This is too complicated for an annotation tool |
Revision 91f7ba1 by Joshua Leung (greasepencil-experimental, greasepencil-object, greasepencil-refactor, soc-2019-npr, temp-gpencil-eval, temp-greasepencil-vfx) June 28, 2018, 09:25 (GMT) |
Remove "Continuous Drawing" flag/mode * GP Object doesn't need this as it has a proper "Draw Mode" * For Annotations, it just got in the way and was a confusing modal+blocking nuissance that randomly activates when you just want to draw a quick line |
Revision bec3a00 by Joshua Leung (greasepencil-experimental, greasepencil-object, greasepencil-refactor, soc-2019-npr, temp-gpencil-eval, temp-greasepencil-vfx) June 28, 2018, 09:15 (GMT) |
Annotations Fix: "Freehand" mode now works Was over-zealous when removing code from the drawing operator to remove all the non-essential additions here. Now annotations work in some of the 2D views: * Nodes/Image Editor are confirmed to work * Sequencer Preview needs further work * Movie Clip editor works |
Revision 3de4039 by Antonio Vazquez (greasepencil-experimental, greasepencil-object, greasepencil-refactor, soc-2019-npr, temp-gpencil-eval, temp-greasepencil-vfx) June 28, 2018, 08:19 (GMT) |
Fix stabilizer cursor after annotations The cursor was drawn to wrong position after use annotations. |
Revision 398ce6d by Joshua Leung (greasepencil-experimental, greasepencil-object, greasepencil-refactor, soc-2019-npr, temp-gpencil-eval, temp-greasepencil-vfx) June 28, 2018, 07:13 (GMT) |
Cleanup: Change "Drawing Tools" panel to use the annotation tools, not old GP drawing operator This panel is going away soon, to be replaced by the active tools system. But in the meantime, we need to stop using this old panel as it will cause crashes when used. |
Revision 76f914d by Joshua Leung (greasepencil-experimental, greasepencil-object, greasepencil-refactor, soc-2019-npr, temp-gpencil-eval, temp-greasepencil-vfx) June 28, 2018, 07:13 (GMT) |
Fix: Errors in console when using annotations in viewport Was caused by a missing poll callback for a GP object panel |
Revision 894b3b1 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: Put in place basic building blocks for Annoations UI (WIP) This is still a rough draft, just restoring all the essential bits and pieces to have a workable system. |
Revision 979a881 by Joshua Leung (greasepencil-experimental, greasepencil-object, greasepencil-refactor, soc-2019-npr, temp-gpencil-eval, temp-greasepencil-vfx) June 28, 2018, 07:13 (GMT) |
Cleanup: Remove unused stuff |
Revision f1470f8 by Joshua Leung (greasepencil-experimental, greasepencil-object, greasepencil-refactor, soc-2019-npr, temp-gpencil-eval, temp-greasepencil-vfx) June 28, 2018, 07:13 (GMT) |
Cleanup: Move GP-Object specific UI panels to the appropriate file |
Revision 6b42183 by Joshua Leung (greasepencil-experimental, greasepencil-object, greasepencil-refactor, soc-2019-npr, temp-gpencil-eval, temp-greasepencil-vfx) June 28, 2018, 07:13 (GMT) |
3D Annotations: Restore ability to access annotations from the 3D view For now, the "gpencil" context properties work as follows: * If the active object is a GP Object, the GP data associated with that is returned * Otherwise, the Scene's GP data (i.e. annotations) are used We may need to revise this later. But in the meantime, I'm restoring this so that we have a quick way of figuring out what parts of the annotation tool workflow are currently broken. |
|