Grease Pencil: WIP Code Reordering + Context Stuff

* Shuffled some code around, and renamed some functions used for getting context info
- Split UI-buttons into a separate file from stroke-drawing code
- Removed some obsolete code (i.e. old paint code that used to be in _edit, but which has been moved to _paint). 

* Made drawing in 3D-View default to using the active object as the owner of the Grease Pencil data. For now, the drawing code will therefore only show the GP data for the active object only. More work to come on this.

* Fixed freeing code for Objects/Scenes with GP data.

1 files changed, 11 insertions, 25 deletions

diff --git a/source/blender/editors/include/ED_gpencil.h b/source/blender/editors/include/ED_gpencil.h
index c1e37ce2e81..25e622d8551 100644
--- a/source/blender/editors/include/ED_gpencil.h
+++ b/source/blender/editors/include/ED_gpencil.h
@@ -38,49 +38,35 @@ struct SpaceSeq;
 struct bGPdata;
 struct bGPDlayer;
 struct bGPDframe;
-struct bGPdata;
+struct PointerRNA;
+struct uiLayout;
 struct uiBlock;
 struct ImBuf;
 struct wmWindowManager;
 
 
-/* ------------- Grease-Pencil Helpers -------------- */
+/* ------------- Grease-Pencil Helpers ---------------- */
 
-/* Temporary 'Stroke Point' data */
+/* Temporary 'Stroke Point' data 
+ *
+ * Used as part of the 'stroke cache' used during drawing of new strokes
+ */
 typedef struct tGPspoint {
 	short x, y;				/* x and y coordinates of cursor (in relative to area) */
 	float pressure;			/* pressure of tablet at this point */
 } tGPspoint;
 
-/* ----------- Grease Pencil New Tools ------------- */
+/* ----------- Grease Pencil Tools/Context ------------- */
 
-struct bGPdata *gpencil_data_getactive(struct bContext *C);
+struct bGPdata **gpencil_data_get_pointers(struct bContext *C, struct PointerRNA *ptr);
+struct bGPdata *gpencil_data_get_active(struct bContext *C);
 
-/* ----------- Grease Pencil Operators ------------- */
+/* ----------- Grease Pencil Operators ----------------- */
 
 void gpencil_common_keymap(struct wmWindowManager *wm, ListBase *keymap);
 
 void ED_operatortypes_gpencil(void);
 
-/* ------------ Grease-Pencil Depreceated Stuff ------------------ */
-
-//struct bGPdata *gpencil_data_getactive(struct ScrArea *sa);
-short gpencil_data_setactive(struct ScrArea *sa, struct bGPdata *gpd);
-struct ScrArea *gpencil_data_findowner(struct bGPdata *gpd);
-
-/* ------------ Grease-Pencil Editing API ------------------ */
-
-void gpencil_delete_actframe(struct bGPdata *gpd, int cfra);
-void gpencil_delete_laststroke(struct bGPdata *gpd, int cfra);
-
-void gpencil_delete_operation(int cfra, short mode);
-void gpencil_delete_menu(void);
-
-void gpencil_convert_operation(short mode);
-void gpencil_convert_menu(void);
-
-short gpencil_do_paint(struct bContext *C);
-
 /* ------------ Grease-Pencil Drawing API ------------------ */
 /* drawgpencil.c */