Revision 4eefe33 by Joshua Leung (greasepencil-experimental, greasepencil-object, greasepencil-refactor, soc-2019-npr, temp-gpencil-eval, temp-greasepencil-vfx) July 5, 2018, 15:44 (GMT) |
Icons for Grease Pencil/Annotation tools These were in the icon_geom.blend file in SVN (lib/resources), but needed to be manually added to the Export group for this to work. They are needed for use for use with the annotation tools. NOTE: There are currently problems running the icon generation scripts in the gp-object branch due to some file loading pointer remapping problems there causing segfaults when running the script. Thus, I generated these icons using the 2.8 branch, then cherry-picked that commit over to this branch. |
Revision b643f32 by Joshua Leung (greasepencil-experimental, greasepencil-object, greasepencil-refactor, soc-2019-npr, temp-gpencil-eval, temp-greasepencil-vfx) July 5, 2018, 12:38 (GMT) |
Fixes for incorrect version patching code introduced in b6776304e76a * newlibadr() shouldn't be called from direct_link_* functions Besides, the pointers in question get corrected in lib_link_material() already * Added expand_doit() calls for the sima and ima pointers. Following what's done for tex->ima, these also get expand_doit() calls, since they increase the usercount of images when used. |
Revision 4b64b7e by Joshua Leung (greasepencil-experimental, greasepencil-object, greasepencil-refactor, soc-2019-npr, temp-gpencil-eval, temp-greasepencil-vfx) July 5, 2018, 12:38 (GMT) |
Cleanup: Remove the obsolete "ts->gp_brushes" field This isn't used or accessed from anywhere anymore, so time to remove it |
Revision 41418be by Antonio Vazquez (greasepencil-experimental, greasepencil-object, greasepencil-refactor, soc-2019-npr, temp-gpencil-eval, temp-greasepencil-vfx) July 5, 2018, 07:49 (GMT) |
Merge branch 'blender2.8' into greasepencil-object |
Revision 08b9036 by Antonio Vazquez (greasepencil-experimental, greasepencil-object, greasepencil-refactor, soc-2019-npr, temp-gpencil-eval, temp-greasepencil-vfx) July 4, 2018, 13:44 (GMT) |
Enable Grease Pencil paper in edit mode |
Revision 8c45d27 by Antonio Vazquez (greasepencil-experimental, greasepencil-object, greasepencil-refactor, soc-2019-npr, temp-gpencil-eval, temp-greasepencil-vfx) July 4, 2018, 10:53 (GMT) |
Merge branch 'blender2.8' into greasepencil-object Conflicts: source/blender/blenkernel/intern/object.c |
Revision b677630 by Antonio Vazquez (greasepencil-experimental, greasepencil-object, greasepencil-refactor, soc-2019-npr, temp-gpencil-eval, temp-greasepencil-vfx) July 4, 2018, 10:51 (GMT) |
Fix missed materials after append GP object |
Revision ecb4a65 by Antonio Vazquez (greasepencil-experimental, greasepencil-object, greasepencil-refactor, soc-2019-npr, temp-gpencil-eval, temp-greasepencil-vfx) July 4, 2018, 07:11 (GMT) |
Merge branch 'blender2.8' into greasepencil-object |
Revision 03082dd by Antonio Vazquez (greasepencil-experimental, greasepencil-object, greasepencil-refactor, soc-2019-npr, temp-gpencil-eval, temp-greasepencil-vfx) July 3, 2018, 17:46 (GMT) |
Merge branch 'blender2.8' into greasepencil-object Conflicts: release/scripts/startup/bl_ui/space_view3d.py |
Revision 9d96302 by Joshua Leung (greasepencil-experimental, greasepencil-object, greasepencil-refactor, soc-2019-npr, temp-gpencil-eval, temp-greasepencil-vfx) July 3, 2018, 15:57 (GMT) |
Fix typo |
Revision 891a944 by Joshua Leung (greasepencil-experimental, greasepencil-object, greasepencil-refactor, soc-2019-npr, temp-gpencil-eval, temp-greasepencil-vfx) July 3, 2018, 15:43 (GMT) |
Fix: Crash when erasing annotation strokes The code was assuming that dvert data always exists on strokes (it shouldn't, if we're doing everything correctly!), which caused crashes when erasing annotation strokes (which definitely don't have this data). TODO: Check that the rest of the code doesn't make similar assumptions! |
Revision 179dfd0 by Joshua Leung (greasepencil-experimental, greasepencil-object, greasepencil-refactor, soc-2019-npr, temp-gpencil-eval, temp-greasepencil-vfx) July 3, 2018, 15:43 (GMT) |
Cleanup: Remove 2D Editor support from gpencil_paint.c The "GPENCIL_OT_draw" operator pretty much didn't support non-3D views already (at least not without crashing). Now that we've got a separate/dedicated operator for Annotation support (GPENCIL_OT_annotate), we can remove the old 2D Editor support here. |
Revision c3f5c1d by Joshua Leung (greasepencil-experimental, greasepencil-object, greasepencil-refactor, soc-2019-npr, temp-gpencil-eval, temp-greasepencil-vfx) July 3, 2018, 15:43 (GMT) |
Cleanup: Remove "Scene->gp_object" This was from an earlier design for supporting Annotations, where in the 3D view, we would have only had GP Objects. Now that we've moved away from that idea, and are back to having a separate "Annotations" system, this concept can be removed from the code again. |
Revision cc7bbda by Joshua Leung (greasepencil-experimental, greasepencil-object, greasepencil-refactor, soc-2019-npr, temp-gpencil-eval, temp-greasepencil-vfx) July 3, 2018, 15:43 (GMT) |
Annotations: WIP first steps towards toolbar support This adds a toolbar entry for activating the annotations tools as active tools. Many things are WIP still (e.g. tool settings are yet to come, as the necessary props aren't defined in DNA/RNA yet). Todo's: * Icons are missing. The necessary icons *do* exist right now in the icon_geom.blend file, but I can't get them to export/generate .dat files that we can use in the UI here. That said, the placeholder names (from that file) are now used. * Key mappings need work/testing. They seem to work well enough as-is already though * Tool settings (in topbar) are not implemented yet. Coming soon (aka tomorrow, after I get some sleep) * Non-3D view toolbar support |
Revision 6cb0327 by Joshua Leung (greasepencil-experimental, greasepencil-object, greasepencil-refactor, soc-2019-npr, temp-gpencil-eval, temp-greasepencil-vfx) July 3, 2018, 15:43 (GMT) |
Cleanup: Remove deprecated toolsettings->gpencil_src field This was used to determine whether Grease Pencil data was stored on the Scene level or per Object. It isn't actually used anywhere in 2.8 now, with the GP Objects / Annotations. Removing now to make space for storing the toolsettings for the annotation tools. |
Revision d86b7f5 by Antonio Vazquez (greasepencil-experimental, greasepencil-object, greasepencil-refactor, soc-2019-npr, temp-gpencil-eval, temp-greasepencil-vfx) July 3, 2018, 07:59 (GMT) |
Merge branch 'blender2.8' into greasepencil-object |
Revision 339708d by Joshua Leung (greasepencil-experimental, greasepencil-object, greasepencil-refactor, soc-2019-npr, temp-gpencil-eval, temp-greasepencil-vfx) July 3, 2018, 05:15 (GMT) |
GP UI: Make the "Grease Pencil Paper" panel/options part of the Overlays popover This is a special feature only used during Draw Mode, and functionally acts like an overlay. Some cleanups/tweaks to this are needed still, but it's good to get it out of the way. |
Revision df1cf4a by Joshua Leung (greasepencil-experimental, greasepencil-object, greasepencil-refactor, soc-2019-npr, temp-gpencil-eval, temp-greasepencil-vfx) July 3, 2018, 05:11 (GMT) |
Cleanup: Variable Naming |
Revision ebbc047 by Joshua Leung (greasepencil-experimental, greasepencil-object, greasepencil-refactor, soc-2019-npr, temp-gpencil-eval, temp-greasepencil-vfx) July 3, 2018, 01:20 (GMT) |
Merge branch 'blender2.8' into greasepencil-object # Conflicts: # release/scripts/startup/bl_ui/space_view3d.py |
Revision 5abee23 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 for py errors in console, caused by bad poll callback for the "Animation" panel |
|