Code Cleanup: Reshuffling some of the GPencil code
* Moved the context handling stuff into gpencil_utils.c * Moved the datablock and layer operators out into their own file too. Again, these weren't related to the other stuff that much * Split the GPencil to Curves operator out into its own file (gpencil_convert.c). This was quite a massive blob of code (48kb) that was not that related to the other operators still in that file (gpencil_edit.c)
This commit is contained in:
parent
b6d878fa96
commit
26fa13e6f8
|
|
@ -39,6 +39,8 @@ set(INC_SYS
|
|||
set(SRC
|
||||
drawgpencil.c
|
||||
editaction_gpencil.c
|
||||
gpencil_convert.c
|
||||
gpencil_data.c
|
||||
gpencil_edit.c
|
||||
gpencil_ops.c
|
||||
gpencil_paint.c
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
|
|
@ -0,0 +1,366 @@
|
|||
/*
|
||||
* ***** BEGIN GPL LICENSE BLOCK *****
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or
|
||||
* modify it under the terms of the GNU General Public License
|
||||
* as published by the Free Software Foundation; either version 2
|
||||
* of the License, or (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program; if not, write to the Free Software Foundation,
|
||||
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||
*
|
||||
* The Original Code is Copyright (C) 2008, Blender Foundation, Joshua Leung
|
||||
* This is a new part of Blender
|
||||
*
|
||||
* Contributor(s): Joshua Leung
|
||||
*
|
||||
* ***** END GPL LICENSE BLOCK *****
|
||||
*
|
||||
* Operators for dealing with GP datablocks and layers
|
||||
*/
|
||||
|
||||
/** \file blender/editors/gpencil/gpencil_data.c
|
||||
* \ingroup edgpencil
|
||||
*/
|
||||
|
||||
|
||||
#include <stdio.h>
|
||||
#include <string.h>
|
||||
#include <stdlib.h>
|
||||
#include <stddef.h>
|
||||
#include <math.h>
|
||||
|
||||
#include "MEM_guardedalloc.h"
|
||||
|
||||
#include "BLI_math.h"
|
||||
#include "BLI_blenlib.h"
|
||||
#include "BLI_rand.h"
|
||||
#include "BLI_utildefines.h"
|
||||
|
||||
#include "BLF_translation.h"
|
||||
|
||||
#include "DNA_anim_types.h"
|
||||
#include "DNA_curve_types.h"
|
||||
#include "DNA_object_types.h"
|
||||
#include "DNA_node_types.h"
|
||||
#include "DNA_scene_types.h"
|
||||
#include "DNA_screen_types.h"
|
||||
#include "DNA_space_types.h"
|
||||
#include "DNA_view3d_types.h"
|
||||
#include "DNA_gpencil_types.h"
|
||||
|
||||
#include "BKE_context.h"
|
||||
#include "BKE_curve.h"
|
||||
#include "BKE_depsgraph.h"
|
||||
#include "BKE_fcurve.h"
|
||||
#include "BKE_global.h"
|
||||
#include "BKE_gpencil.h"
|
||||
#include "BKE_library.h"
|
||||
#include "BKE_object.h"
|
||||
#include "BKE_report.h"
|
||||
#include "BKE_scene.h"
|
||||
#include "BKE_screen.h"
|
||||
|
||||
#include "UI_interface.h"
|
||||
|
||||
#include "WM_api.h"
|
||||
#include "WM_types.h"
|
||||
|
||||
#include "RNA_access.h"
|
||||
#include "RNA_define.h"
|
||||
|
||||
#include "UI_view2d.h"
|
||||
|
||||
#include "ED_gpencil.h"
|
||||
#include "ED_view3d.h"
|
||||
#include "ED_keyframing.h"
|
||||
|
||||
#include "gpencil_intern.h"
|
||||
|
||||
|
||||
/* ************************************************ */
|
||||
/* Datablock Operators */
|
||||
|
||||
/* ******************* Add New Data ************************ */
|
||||
|
||||
/* add new datablock - wrapper around API */
|
||||
static int gp_data_add_exec(bContext *C, wmOperator *op)
|
||||
{
|
||||
bGPdata **gpd_ptr = ED_gpencil_data_get_pointers(C, NULL);
|
||||
|
||||
if (gpd_ptr == NULL) {
|
||||
BKE_report(op->reports, RPT_ERROR, "Nowhere for grease pencil data to go");
|
||||
return OPERATOR_CANCELLED;
|
||||
}
|
||||
else {
|
||||
/* decrement user count and add new datablock */
|
||||
bGPdata *gpd = (*gpd_ptr);
|
||||
|
||||
id_us_min(&gpd->id);
|
||||
*gpd_ptr = gpencil_data_addnew(DATA_("GPencil"));
|
||||
}
|
||||
|
||||
/* notifiers */
|
||||
WM_event_add_notifier(C, NC_GPENCIL | ND_DATA | NA_EDITED, NULL);
|
||||
|
||||
return OPERATOR_FINISHED;
|
||||
}
|
||||
|
||||
void GPENCIL_OT_data_add(wmOperatorType *ot)
|
||||
{
|
||||
/* identifiers */
|
||||
ot->name = "Grease Pencil Add New";
|
||||
ot->idname = "GPENCIL_OT_data_add";
|
||||
ot->description = "Add new Grease Pencil datablock";
|
||||
ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
|
||||
|
||||
/* callbacks */
|
||||
ot->exec = gp_data_add_exec;
|
||||
ot->poll = gp_add_poll;
|
||||
}
|
||||
|
||||
/* ******************* Unlink Data ************************ */
|
||||
|
||||
/* poll callback for adding data/layers - special */
|
||||
static int gp_data_unlink_poll(bContext *C)
|
||||
{
|
||||
bGPdata **gpd_ptr = ED_gpencil_data_get_pointers(C, NULL);
|
||||
|
||||
/* if we have access to some active data, make sure there's a datablock before enabling this */
|
||||
return (gpd_ptr && *gpd_ptr);
|
||||
}
|
||||
|
||||
|
||||
/* unlink datablock - wrapper around API */
|
||||
static int gp_data_unlink_exec(bContext *C, wmOperator *op)
|
||||
{
|
||||
bGPdata **gpd_ptr = ED_gpencil_data_get_pointers(C, NULL);
|
||||
|
||||
if (gpd_ptr == NULL) {
|
||||
BKE_report(op->reports, RPT_ERROR, "Nowhere for grease pencil data to go");
|
||||
return OPERATOR_CANCELLED;
|
||||
}
|
||||
else {
|
||||
/* just unlink datablock now, decreasing its user count */
|
||||
bGPdata *gpd = (*gpd_ptr);
|
||||
|
||||
id_us_min(&gpd->id);
|
||||
*gpd_ptr = NULL;
|
||||
}
|
||||
|
||||
/* notifiers */
|
||||
WM_event_add_notifier(C, NC_GPENCIL | ND_DATA | NA_EDITED, NULL);
|
||||
|
||||
return OPERATOR_FINISHED;
|
||||
}
|
||||
|
||||
void GPENCIL_OT_data_unlink(wmOperatorType *ot)
|
||||
{
|
||||
/* identifiers */
|
||||
ot->name = "Grease Pencil Unlink";
|
||||
ot->idname = "GPENCIL_OT_data_unlink";
|
||||
ot->description = "Unlink active Grease Pencil datablock";
|
||||
ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
|
||||
|
||||
/* callbacks */
|
||||
ot->exec = gp_data_unlink_exec;
|
||||
ot->poll = gp_data_unlink_poll;
|
||||
}
|
||||
|
||||
|
||||
/* ************************************************ */
|
||||
/* Layer Operators */
|
||||
|
||||
/* ******************* Add New Layer ************************ */
|
||||
|
||||
/* add new layer - wrapper around API */
|
||||
static int gp_layer_add_exec(bContext *C, wmOperator *op)
|
||||
{
|
||||
bGPdata **gpd_ptr = ED_gpencil_data_get_pointers(C, NULL);
|
||||
|
||||
/* if there's no existing Grease-Pencil data there, add some */
|
||||
if (gpd_ptr == NULL) {
|
||||
BKE_report(op->reports, RPT_ERROR, "Nowhere for grease pencil data to go");
|
||||
return OPERATOR_CANCELLED;
|
||||
}
|
||||
if (*gpd_ptr == NULL)
|
||||
*gpd_ptr = gpencil_data_addnew(DATA_("GPencil"));
|
||||
|
||||
/* add new layer now */
|
||||
gpencil_layer_addnew(*gpd_ptr, DATA_("GP_Layer"), 1);
|
||||
|
||||
/* notifiers */
|
||||
WM_event_add_notifier(C, NC_GPENCIL | ND_DATA | NA_EDITED, NULL);
|
||||
|
||||
return OPERATOR_FINISHED;
|
||||
}
|
||||
|
||||
void GPENCIL_OT_layer_add(wmOperatorType *ot)
|
||||
{
|
||||
/* identifiers */
|
||||
ot->name = "Add New Layer";
|
||||
ot->idname = "GPENCIL_OT_layer_add";
|
||||
ot->description = "Add new Grease Pencil layer for the active Grease Pencil datablock";
|
||||
|
||||
ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
|
||||
|
||||
/* callbacks */
|
||||
ot->exec = gp_layer_add_exec;
|
||||
ot->poll = gp_add_poll;
|
||||
}
|
||||
|
||||
/* ******************* Remove Active Layer ************************* */
|
||||
|
||||
static int gp_layer_remove_exec(bContext *C, wmOperator *op)
|
||||
{
|
||||
bGPdata *gpd = ED_gpencil_data_get_active(C);
|
||||
bGPDlayer *gpl = gpencil_layer_getactive(gpd);
|
||||
|
||||
/* sanity checks */
|
||||
if (ELEM(NULL, gpd, gpl))
|
||||
return OPERATOR_CANCELLED;
|
||||
|
||||
if (gpl->flag & GP_LAYER_LOCKED) {
|
||||
BKE_report(op->reports, RPT_ERROR, "Cannot delete locked layers");
|
||||
return OPERATOR_CANCELLED;
|
||||
}
|
||||
|
||||
/* make the layer before this the new active layer
|
||||
* - use the one after if this is the first
|
||||
* - if this is the only layer, this naturally becomes NULL
|
||||
*/
|
||||
if (gpl->prev)
|
||||
gpencil_layer_setactive(gpd, gpl->prev);
|
||||
else
|
||||
gpencil_layer_setactive(gpd, gpl->next);
|
||||
|
||||
/* delete the layer now... */
|
||||
gpencil_layer_delete(gpd, gpl);
|
||||
|
||||
/* notifiers */
|
||||
WM_event_add_notifier(C, NC_GPENCIL | ND_DATA | NA_EDITED, NULL);
|
||||
|
||||
return OPERATOR_FINISHED;
|
||||
}
|
||||
|
||||
void GPENCIL_OT_layer_remove(wmOperatorType *ot)
|
||||
{
|
||||
/* identifiers */
|
||||
ot->name = "Remove Layer";
|
||||
ot->idname = "GPENCIL_OT_layer_remove";
|
||||
ot->description = "Remove active Grease Pencil layer";
|
||||
|
||||
ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
|
||||
|
||||
/* callbacks */
|
||||
ot->exec = gp_layer_remove_exec;
|
||||
ot->poll = gp_active_layer_poll;
|
||||
}
|
||||
|
||||
/* ******************* Move Layer Up/Down ************************** */
|
||||
|
||||
enum {
|
||||
GP_LAYER_MOVE_UP = -1,
|
||||
GP_LAYER_MOVE_DOWN = 1
|
||||
};
|
||||
|
||||
static int gp_layer_move_exec(bContext *C, wmOperator *op)
|
||||
{
|
||||
bGPdata *gpd = ED_gpencil_data_get_active(C);
|
||||
bGPDlayer *gpl = gpencil_layer_getactive(gpd);
|
||||
|
||||
int direction = RNA_enum_get(op->ptr, "type");
|
||||
|
||||
/* sanity checks */
|
||||
if (ELEM(NULL, gpd, gpl))
|
||||
return OPERATOR_CANCELLED;
|
||||
|
||||
/* up or down? */
|
||||
if (direction == GP_LAYER_MOVE_UP) {
|
||||
/* up */
|
||||
BLI_remlink(&gpd->layers, gpl);
|
||||
BLI_insertlinkbefore(&gpd->layers, gpl->prev, gpl);
|
||||
}
|
||||
else {
|
||||
/* down */
|
||||
BLI_remlink(&gpd->layers, gpl);
|
||||
BLI_insertlinkafter(&gpd->layers, gpl->next, gpl);
|
||||
}
|
||||
|
||||
/* notifiers */
|
||||
WM_event_add_notifier(C, NC_GPENCIL | ND_DATA | NA_EDITED, NULL);
|
||||
|
||||
return OPERATOR_FINISHED;
|
||||
}
|
||||
|
||||
void GPENCIL_OT_layer_move(wmOperatorType *ot)
|
||||
{
|
||||
static EnumPropertyItem slot_move[] = {
|
||||
{GP_LAYER_MOVE_UP, "UP", 0, "Up", ""},
|
||||
{GP_LAYER_MOVE_DOWN, "DOWN", 0, "Down", ""},
|
||||
{0, NULL, 0, NULL, NULL}
|
||||
};
|
||||
|
||||
/* identifiers */
|
||||
ot->name = "Move Grease Pencil Layer";
|
||||
ot->idname = "GPENCIL_OT_layer_move";
|
||||
ot->description = "Move the active Grease Pencil layer up/down in the list";
|
||||
|
||||
/* api callbacks */
|
||||
ot->exec = gp_layer_move_exec;
|
||||
ot->poll = gp_active_layer_poll;
|
||||
|
||||
/* flags */
|
||||
ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
|
||||
|
||||
ot->prop = RNA_def_enum(ot->srna, "type", slot_move, 0, "Type", "");
|
||||
}
|
||||
|
||||
/* ********************* Duplicate Layer ************************** */
|
||||
|
||||
static int gp_layer_copy_exec(bContext *C, wmOperator *UNUSED(op))
|
||||
{
|
||||
bGPdata *gpd = ED_gpencil_data_get_active(C);
|
||||
bGPDlayer *gpl = gpencil_layer_getactive(gpd);
|
||||
bGPDlayer *new_layer;
|
||||
|
||||
/* sanity checks */
|
||||
if (ELEM(NULL, gpd, gpl))
|
||||
return OPERATOR_CANCELLED;
|
||||
|
||||
/* make copy of layer, and add it immediately after the existing layer */
|
||||
new_layer = gpencil_layer_duplicate(gpl);
|
||||
BLI_insertlinkafter(&gpd->layers, gpl, new_layer);
|
||||
|
||||
/* ensure new layer has a unique name, and is now the active layer */
|
||||
BLI_uniquename(&gpd->layers, new_layer, DATA_("GP_Layer"), '.', offsetof(bGPDlayer, info), sizeof(new_layer->info));
|
||||
gpencil_layer_setactive(gpd, new_layer);
|
||||
|
||||
/* notifiers */
|
||||
WM_event_add_notifier(C, NC_GPENCIL | ND_DATA | NA_EDITED, NULL);
|
||||
|
||||
return OPERATOR_FINISHED;
|
||||
}
|
||||
|
||||
void GPENCIL_OT_layer_duplicate(wmOperatorType *ot)
|
||||
{
|
||||
/* identifiers */
|
||||
ot->name = "Duplicate Layer";
|
||||
ot->idname = "GPENCIL_OT_layer_duplicate";
|
||||
ot->description = "Make a copy of the active Grease Pencil layer";
|
||||
|
||||
/* callbacks */
|
||||
ot->exec = gp_layer_copy_exec;
|
||||
ot->poll = gp_active_layer_poll;
|
||||
|
||||
/* flags */
|
||||
ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
|
||||
}
|
||||
|
||||
/* ************************************************ */
|
||||
File diff suppressed because it is too large
Load Diff
|
|
@ -96,6 +96,12 @@ void gp_point_conversion_init(struct bContext *C, GP_SpaceConversion *r_gsc);
|
|||
void gp_point_to_xy(GP_SpaceConversion *settings, struct bGPDstroke *gps, struct bGPDspoint *pt,
|
||||
int *r_x, int *r_y);
|
||||
|
||||
/* Poll Callbacks ------------------------------------ */
|
||||
/* gpencil_utils.c */
|
||||
|
||||
int gp_add_poll(struct bContext *C);
|
||||
int gp_active_layer_poll(struct bContext *C);
|
||||
|
||||
/* ***************************************************** */
|
||||
/* Operator Defines */
|
||||
|
||||
|
|
|
|||
|
|
@ -37,23 +37,201 @@
|
|||
#include "BLI_utildefines.h"
|
||||
|
||||
#include "DNA_gpencil_types.h"
|
||||
#include "DNA_object_types.h"
|
||||
#include "DNA_scene_types.h"
|
||||
#include "DNA_screen_types.h"
|
||||
#include "DNA_space_types.h"
|
||||
#include "DNA_view3d_types.h"
|
||||
|
||||
#include "BKE_context.h"
|
||||
#include "BKE_gpencil.h"
|
||||
#include "BKE_tracking.h"
|
||||
|
||||
#include "WM_api.h"
|
||||
|
||||
#include "RNA_access.h"
|
||||
#include "RNA_define.h"
|
||||
|
||||
#include "UI_view2d.h"
|
||||
|
||||
#include "ED_gpencil.h"
|
||||
#include "ED_clip.h"
|
||||
#include "ED_view3d.h"
|
||||
|
||||
#include "gpencil_intern.h"
|
||||
|
||||
/* ******************************************************** */
|
||||
/* Context Wrangling... */
|
||||
|
||||
/* Get pointer to active Grease Pencil datablock, and an RNA-pointer to trace back to whatever owns it,
|
||||
* when context info is not available.
|
||||
*/
|
||||
bGPdata **ED_gpencil_data_get_pointers_direct(ID *screen_id, Scene *scene, ScrArea *sa, Object *ob, PointerRNA *ptr)
|
||||
{
|
||||
/* if there's an active area, check if the particular editor may
|
||||
* have defined any special Grease Pencil context for editing...
|
||||
*/
|
||||
if (sa) {
|
||||
SpaceLink *sl = sa->spacedata.first;
|
||||
|
||||
switch (sa->spacetype) {
|
||||
case SPACE_VIEW3D: /* 3D-View */
|
||||
case SPACE_TIME: /* Timeline - XXX: this is a hack to get it to show GP keyframes for 3D view */
|
||||
case SPACE_ACTION: /* DepeSheet - XXX: this is a hack to get the keyframe jump operator to take GP Keyframes into account */
|
||||
{
|
||||
BLI_assert(scene && ELEM(scene->toolsettings->gpencil_src,
|
||||
GP_TOOL_SOURCE_SCENE, GP_TOOL_SOURCE_OBJECT));
|
||||
|
||||
if (scene->toolsettings->gpencil_src == GP_TOOL_SOURCE_OBJECT) {
|
||||
/* legacy behaviour for usage with old addons requiring object-linked to objects */
|
||||
|
||||
/* just in case no active/selected object... */
|
||||
if (ob && (ob->flag & SELECT)) {
|
||||
/* for now, as long as there's an object, default to using that in 3D-View */
|
||||
if (ptr) RNA_id_pointer_create(&ob->id, ptr);
|
||||
return &ob->gpd;
|
||||
}
|
||||
/* else: defaults to scene... */
|
||||
}
|
||||
else {
|
||||
if (ptr) RNA_id_pointer_create(&scene->id, ptr);
|
||||
return &scene->gpd;
|
||||
}
|
||||
break;
|
||||
}
|
||||
case SPACE_NODE: /* Nodes Editor */
|
||||
{
|
||||
SpaceNode *snode = (SpaceNode *)sl;
|
||||
|
||||
/* return the GP data for the active node block/node */
|
||||
if (snode && snode->nodetree) {
|
||||
/* for now, as long as there's an active node tree, default to using that in the Nodes Editor */
|
||||
if (ptr) RNA_id_pointer_create(&snode->nodetree->id, ptr);
|
||||
return &snode->nodetree->gpd;
|
||||
}
|
||||
|
||||
/* even when there is no node-tree, don't allow this to flow to scene */
|
||||
return NULL;
|
||||
}
|
||||
case SPACE_SEQ: /* Sequencer */
|
||||
{
|
||||
SpaceSeq *sseq = (SpaceSeq *)sl;
|
||||
|
||||
/* for now, Grease Pencil data is associated with the space (actually preview region only) */
|
||||
/* XXX our convention for everything else is to link to data though... */
|
||||
if (ptr) RNA_pointer_create(screen_id, &RNA_SpaceSequenceEditor, sseq, ptr);
|
||||
return &sseq->gpd;
|
||||
}
|
||||
case SPACE_IMAGE: /* Image/UV Editor */
|
||||
{
|
||||
SpaceImage *sima = (SpaceImage *)sl;
|
||||
|
||||
/* for now, Grease Pencil data is associated with the space... */
|
||||
/* XXX our convention for everything else is to link to data though... */
|
||||
if (ptr) RNA_pointer_create(screen_id, &RNA_SpaceImageEditor, sima, ptr);
|
||||
return &sima->gpd;
|
||||
}
|
||||
case SPACE_CLIP: /* Nodes Editor */
|
||||
{
|
||||
SpaceClip *sc = (SpaceClip *)sl;
|
||||
MovieClip *clip = ED_space_clip_get_clip(sc);
|
||||
|
||||
if (clip) {
|
||||
if (sc->gpencil_src == SC_GPENCIL_SRC_TRACK) {
|
||||
MovieTrackingTrack *track = BKE_tracking_track_get_active(&clip->tracking);
|
||||
|
||||
if (!track)
|
||||
return NULL;
|
||||
|
||||
if (ptr)
|
||||
RNA_pointer_create(&clip->id, &RNA_MovieTrackingTrack, track, ptr);
|
||||
|
||||
return &track->gpd;
|
||||
}
|
||||
else {
|
||||
if (ptr)
|
||||
RNA_id_pointer_create(&clip->id, ptr);
|
||||
|
||||
return &clip->gpd;
|
||||
}
|
||||
}
|
||||
break;
|
||||
}
|
||||
default: /* unsupported space */
|
||||
return NULL;
|
||||
}
|
||||
}
|
||||
|
||||
/* just fall back on the scene's GP data */
|
||||
if (ptr) RNA_id_pointer_create((ID *)scene, ptr);
|
||||
return (scene) ? &scene->gpd : NULL;
|
||||
}
|
||||
|
||||
/* Get pointer to active Grease Pencil datablock, and an RNA-pointer to trace back to whatever owns it */
|
||||
bGPdata **ED_gpencil_data_get_pointers(const bContext *C, PointerRNA *ptr)
|
||||
{
|
||||
ID *screen_id = (ID *)CTX_wm_screen(C);
|
||||
Scene *scene = CTX_data_scene(C);
|
||||
ScrArea *sa = CTX_wm_area(C);
|
||||
Object *ob = CTX_data_active_object(C);
|
||||
|
||||
return ED_gpencil_data_get_pointers_direct(screen_id, scene, sa, ob, ptr);
|
||||
}
|
||||
|
||||
/* -------------------------------------------------------- */
|
||||
|
||||
/* Get the active Grease Pencil datablock, when context is not available */
|
||||
bGPdata *ED_gpencil_data_get_active_direct(ID *screen_id, Scene *scene, ScrArea *sa, Object *ob)
|
||||
{
|
||||
bGPdata **gpd_ptr = ED_gpencil_data_get_pointers_direct(screen_id, scene, sa, ob, NULL);
|
||||
return (gpd_ptr) ? *(gpd_ptr) : NULL;
|
||||
}
|
||||
|
||||
/* Get the active Grease Pencil datablock */
|
||||
bGPdata *ED_gpencil_data_get_active(const bContext *C)
|
||||
{
|
||||
bGPdata **gpd_ptr = ED_gpencil_data_get_pointers(C, NULL);
|
||||
return (gpd_ptr) ? *(gpd_ptr) : NULL;
|
||||
}
|
||||
|
||||
/* -------------------------------------------------------- */
|
||||
|
||||
// XXX: this should be removed... We really shouldn't duplicate logic like this!
|
||||
bGPdata *ED_gpencil_data_get_active_v3d(Scene *scene, View3D *v3d)
|
||||
{
|
||||
Base *base = scene->basact;
|
||||
bGPdata *gpd = NULL;
|
||||
/* We have to make sure active object is actually visible and selected, else we must use default scene gpd,
|
||||
* to be consistent with ED_gpencil_data_get_active's behavior.
|
||||
*/
|
||||
|
||||
if (base && TESTBASE(v3d, base)) {
|
||||
gpd = base->object->gpd;
|
||||
}
|
||||
return gpd ? gpd : scene->gpd;
|
||||
}
|
||||
|
||||
/* ******************************************************** */
|
||||
/* Poll Callbacks */
|
||||
|
||||
/* poll callback for adding data/layers - special */
|
||||
int gp_add_poll(bContext *C)
|
||||
{
|
||||
/* the base line we have is that we have somewhere to add Grease Pencil data */
|
||||
return ED_gpencil_data_get_pointers(C, NULL) != NULL;
|
||||
}
|
||||
|
||||
/* poll callback for checking if there is an active layer */
|
||||
int gp_active_layer_poll(bContext *C)
|
||||
{
|
||||
bGPdata *gpd = ED_gpencil_data_get_active(C);
|
||||
bGPDlayer *gpl = gpencil_layer_getactive(gpd);
|
||||
|
||||
return (gpl != NULL);
|
||||
}
|
||||
|
||||
/* ******************************************************** */
|
||||
/* Brush Tool Core */
|
||||
|
||||
/* Check if part of stroke occurs within last segment drawn by eraser */
|
||||
bool gp_stroke_inside_circle(const int mval[2], const int UNUSED(mvalo[2]),
|
||||
|
|
@ -73,6 +251,7 @@ bool gp_stroke_inside_circle(const int mval[2], const int UNUSED(mvalo[2]),
|
|||
}
|
||||
|
||||
/* ******************************************************** */
|
||||
/* Stroke Validity Testing */
|
||||
|
||||
/* Check whether given stroke can be edited given the supplied context */
|
||||
// XXX: do we need additional flags for screenspace vs dataspace?
|
||||
|
|
@ -109,6 +288,7 @@ bool ED_gpencil_stroke_can_use(const bContext *C, const bGPDstroke *gps)
|
|||
}
|
||||
|
||||
/* ******************************************************** */
|
||||
/* Space Conversion */
|
||||
|
||||
/* Init handling for space-conversion function (from passed-in parameters) */
|
||||
void gp_point_conversion_init(bContext *C, GP_SpaceConversion *r_gsc)
|
||||
|
|
|
|||
Loading…
Reference in New Issue