Revision 105c0d1 by Joshua Leung (greasepencil-experimental, greasepencil-object, greasepencil-refactor, soc-2019-npr, temp-gpencil-eval, temp-greasepencil-vfx) July 2, 2018, 13:42 (GMT) |
Revert "Add annotation layer with the right name" This reverts commit 7931a1357a0f93ac0d7b8e6a564faa0b735a96ff. |
Revision 87a308e by Joshua Leung (greasepencil-experimental, greasepencil-object, greasepencil-refactor, soc-2019-npr, temp-gpencil-eval, temp-greasepencil-vfx) July 2, 2018, 13:42 (GMT) |
GP Object: Don't show Add/Unlink datablock buttons for GP datablock ID selector These buttons are not shown for any other object type, so these shouldn't be shown for Grease Pencil objects. |
Revision 9521de5 by Joshua Leung (greasepencil-experimental, greasepencil-object, greasepencil-refactor, soc-2019-npr, temp-gpencil-eval, temp-greasepencil-vfx) July 2, 2018, 13:42 (GMT) |
Fix: Ensure correct names when using the "New Layer" operator for GP Object and Annotations This replaces what 7931a1357a0f93ac0d7b8e6a564faa0b735a96ff tried to do. We may still need to make these separate operators to simplify things even further. |
Revision bd53e9f by Antonio Vazquez (greasepencil-experimental, greasepencil-object, greasepencil-refactor, soc-2019-npr, temp-gpencil-eval, temp-greasepencil-vfx) July 2, 2018, 11:24 (GMT) |
Remove Animdata update for Palettes This datablock is not animatable. |
Revision cb32dd9 by Antonio Vazquez (greasepencil-experimental, greasepencil-object, greasepencil-refactor, soc-2019-npr, temp-gpencil-eval, temp-greasepencil-vfx) July 2, 2018, 11:03 (GMT) |
Fix parameter type after merge |
Revision fa73cd1 by Antonio Vazquez (greasepencil-experimental, greasepencil-object, greasepencil-refactor, soc-2019-npr, temp-gpencil-eval, temp-greasepencil-vfx) July 2, 2018, 10:48 (GMT) |
Merge branch 'blender2.8' into greasepencil-object Conflicts: source/blender/editors/gpencil/gpencil_data.c source/blender/editors/gpencil/gpencil_edit.c source/blender/editors/gpencil/gpencil_intern.h source/blender/editors/gpencil/gpencil_utils.c source/blender/makesrna/intern/rna_internal.h |
Revision 6728b4a by Campbell Barton (greasepencil-experimental, greasepencil-object, greasepencil-refactor, soc-2019-npr, temp-gpencil-eval, temp-greasepencil-vfx) July 1, 2018, 17:12 (GMT) |
Cleanup: trailing space |
Revision 31fee9b by Campbell Barton (greasepencil-experimental, greasepencil-object, greasepencil-refactor, soc-2019-npr, temp-gpencil-eval, temp-greasepencil-vfx) July 1, 2018, 17:10 (GMT) |
Merge branch '28' into greasepencil-object |
Revision 531f833 by Campbell Barton (greasepencil-experimental, greasepencil-object, greasepencil-refactor, soc-2019-npr, temp-gpencil-eval, temp-greasepencil-vfx) July 1, 2018, 17:09 (GMT) |
Cleanup: unused vars & comment block that doesn't run |
Revision 014395c by Antonio Vazquez (greasepencil-experimental, greasepencil-object, greasepencil-refactor, soc-2019-npr, temp-gpencil-eval, temp-greasepencil-vfx) July 1, 2018, 09:09 (GMT) |
Rename variable after merge |
Revision a1f0aed by Antonio Vazquez (greasepencil-experimental, greasepencil-object, greasepencil-refactor, soc-2019-npr, temp-gpencil-eval, temp-greasepencil-vfx) July 1, 2018, 09:01 (GMT) |
Merge branch 'blender2.8' into greasepencil-object |
Revision 7931a13 by Antonio Vazquez (greasepencil-experimental, greasepencil-object, greasepencil-refactor, soc-2019-npr, temp-gpencil-eval, temp-greasepencil-vfx) July 1, 2018, 09:00 (GMT) |
Add annotation layer with the right name When adding layers, the name of the layer is different for grease pencil object and annotation. |
Revision 552b954 by Antonio Vazquez (greasepencil-experimental, greasepencil-object, greasepencil-refactor, soc-2019-npr, temp-gpencil-eval, temp-greasepencil-vfx) June 30, 2018, 17:38 (GMT) |
Merge branch 'blender2.8' into greasepencil-object |
Revision 02f4a18 by Antonio Vazquez (greasepencil-experimental, greasepencil-object, greasepencil-refactor, soc-2019-npr, temp-gpencil-eval, temp-greasepencil-vfx) June 30, 2018, 07:00 (GMT) |
Merge branch 'blender2.8' into greasepencil-object |
Revision cb144fe by Antonio Vazquez (greasepencil-experimental, greasepencil-object, greasepencil-refactor, soc-2019-npr, temp-gpencil-eval, temp-greasepencil-vfx) June 29, 2018, 18:41 (GMT) |
Merge branch 'blender2.8' into greasepencil-object |
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. |
Revision e262683 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 Keymap: Restore D-RMB for eraser |
Revision 8308a05 by Joshua Leung (greasepencil-experimental, greasepencil-object, greasepencil-refactor, soc-2019-npr, temp-gpencil-eval, temp-greasepencil-vfx) June 29, 2018, 14:52 (GMT) |
Cleanup: Remove redundant code + note some code issues to fix |
Revision bc0f489 by Antonio Vazquez (greasepencil-experimental, greasepencil-object, greasepencil-refactor, soc-2019-npr, temp-gpencil-eval, temp-greasepencil-vfx) June 29, 2018, 10:51 (GMT) |
Set annotions drawing mode always on top The annotations must be visible on top of any other object in the scene. |
Revision ebadf39 by Antonio Vazquez (greasepencil-experimental, greasepencil-object, greasepencil-refactor, soc-2019-npr, temp-gpencil-eval, temp-greasepencil-vfx) June 29, 2018, 09:04 (GMT) |
Fix render type name error |
|