diff options
| author | Antonio Vazquez <blendergit@gmail.com> | 2020-01-07 13:29:42 +0300 |
|---|---|---|
| committer | Antonio Vazquez <blendergit@gmail.com> | 2020-01-07 13:34:20 +0300 |
| commit | fa3a0697b846bd0ed3766fcabd1bf6f260aa425a (patch) | |
| tree | 19a1bc85b29fb1cced92246270864bb8d1b41c35 /source/blender/editors/include | |
| parent | e237b78b91b9e88da8e3c4a5fb360101238c39e4 (diff) | |
Annotations: Split annotation operators and pointer functions
This allows to have annotation panels and grease pencil object panel at the same time.
Differential Revision: https://developer.blender.org/D6467
Diffstat (limited to 'source/blender/editors/include')
| -rw-r--r-- | source/blender/editors/include/ED_gpencil.h | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/source/blender/editors/include/ED_gpencil.h b/source/blender/editors/include/ED_gpencil.h index dce0e3931be..23dbf24ed7b 100644 --- a/source/blender/editors/include/ED_gpencil.h +++ b/source/blender/editors/include/ED_gpencil.h @@ -97,15 +97,21 @@ struct bGPdata *ED_gpencil_data_get_active(const struct bContext *C); struct bGPdata *ED_gpencil_data_get_active_evaluated(const struct bContext *C); /* Context independent (i.e. each required part is passed in instead) */ -struct bGPdata **ED_gpencil_data_get_pointers_direct(struct ID *screen_id, - struct ScrArea *sa, - struct Scene *scene, +struct bGPdata **ED_gpencil_data_get_pointers_direct(struct ScrArea *sa, struct Object *ob, struct PointerRNA *r_ptr); -struct bGPdata *ED_gpencil_data_get_active_direct(struct ID *screen_id, - struct ScrArea *sa, - struct Scene *scene, - struct Object *ob); +struct bGPdata *ED_gpencil_data_get_active_direct(struct ScrArea *sa, struct Object *ob); + +struct bGPdata *ED_annotation_data_get_active(const struct bContext *C); +struct bGPdata **ED_annotation_data_get_pointers(const struct bContext *C, + struct PointerRNA *r_ptr); +struct bGPdata **ED_annotation_data_get_pointers_direct(struct ID *screen_id, + struct ScrArea *sa, + struct Scene *scene, + struct PointerRNA *r_ptr); +struct bGPdata *ED_annotation_data_get_active_direct(struct ID *screen_id, + struct ScrArea *sa, + struct Scene *scene); bool ED_gpencil_data_owner_is_annotation(struct PointerRNA *owner_ptr); |