diff options
Diffstat (limited to 'source/blender/makesrna/intern/rna_gpencil.c')
| -rw-r--r-- | source/blender/makesrna/intern/rna_gpencil.c | 335 |
1 files changed, 34 insertions, 301 deletions
diff --git a/source/blender/makesrna/intern/rna_gpencil.c b/source/blender/makesrna/intern/rna_gpencil.c index b0fcfb9b540..131611d3002 100644 --- a/source/blender/makesrna/intern/rna_gpencil.c +++ b/source/blender/makesrna/intern/rna_gpencil.c @@ -40,15 +40,6 @@ #ifdef RNA_RUNTIME -#include "WM_api.h" - -#include "BKE_gpencil.h" - -static void rna_GPencil_update(Main *UNUSED(bmain), Scene *UNUSED(scene), PointerRNA *UNUSED(ptr)) -{ - WM_main_add_notifier(NC_GPENCIL | NA_EDITED, NULL); -} - static int rna_GPencilLayer_active_frame_editable(PointerRNA *ptr) { bGPDlayer *gpl = (bGPDlayer *)ptr->data; @@ -62,7 +53,6 @@ static int rna_GPencilLayer_active_frame_editable(PointerRNA *ptr) static PointerRNA rna_GPencil_active_layer_get(PointerRNA *ptr) { - bGPdata *gpd = ptr->id.data; if (GS(gpd->id.name) == ID_GD) { /* why would this ever be not GD */ @@ -111,154 +101,6 @@ static void rna_GPencilLayer_info_set(PointerRNA *ptr, const char *value) BLI_uniquename(&gpd->layers, gpl, "GP_Layer", '.', offsetof(bGPDlayer, info), sizeof(gpl->info)); } -static void rna_GPencil_stroke_point_add(bGPDstroke *stroke, int count) -{ - if (count > 0) { - if (stroke->points == NULL) - stroke->points = MEM_callocN(sizeof(bGPDspoint) * count, "gp_stroke_points"); - else - stroke->points = MEM_reallocN(stroke->points, sizeof(bGPDspoint) * (stroke->totpoints + count)); - - stroke->totpoints += count; - } -} - -static void rna_GPencil_stroke_point_pop(bGPDstroke *stroke, ReportList *reports, int index) -{ - bGPDspoint *pt_tmp = stroke->points; - - /* python style negative indexing */ - if (index < 0) { - index += stroke->totpoints; - } - - if (stroke->totpoints <= index || index < 0) { - BKE_report(reports, RPT_ERROR, "GPencilStrokePoints.pop: index out of range"); - return; - } - - stroke->totpoints--; - - stroke->points = MEM_callocN(sizeof(bGPDspoint) * stroke->totpoints, "gp_stroke_points"); - - if (index > 0) - memcpy(stroke->points, pt_tmp, sizeof(bGPDspoint) * index); - - if (index < stroke->totpoints) - memcpy(&stroke->points[index], &pt_tmp[index + 1], sizeof(bGPDspoint) * (stroke->totpoints - index)); - - /* free temp buffer */ - MEM_freeN(pt_tmp); - - WM_main_add_notifier(NC_GPENCIL | NA_EDITED, NULL); -} - -static bGPDstroke *rna_GPencil_stroke_new(bGPDframe *frame) -{ - bGPDstroke *stroke = MEM_callocN(sizeof(bGPDstroke), "gp_stroke"); - - BLI_addtail(&frame->strokes, stroke); - - return stroke; -} - -static void rna_GPencil_stroke_remove(bGPDframe *frame, ReportList *reports, bGPDstroke *stroke) -{ - if (BLI_findindex(&frame->strokes, stroke) == -1) { - BKE_reportf(reports, RPT_ERROR, "Stroke not found in grease pencil frame"); - return; - } - - BLI_freelinkN(&frame->strokes, stroke); - - WM_main_add_notifier(NC_GPENCIL | NA_EDITED, NULL); -} - -static bGPDframe *rna_GPencil_frame_new(bGPDlayer *layer, ReportList *reports, int frame_number) -{ - bGPDframe *frame; - - if (BKE_gpencil_layer_find_frame(layer, frame_number)) { - BKE_reportf(reports, RPT_ERROR, "Frame already exists on this frame number"); - return NULL; - } - - frame = gpencil_frame_addnew(layer, frame_number); - - WM_main_add_notifier(NC_GPENCIL | NA_EDITED, NULL); - - return frame; -} - -static void rna_GPencil_frame_remove(bGPDlayer *layer, ReportList *reports, bGPDframe *frame) -{ - if (BLI_findindex(&layer->frames, frame) == -1) { - BKE_reportf(reports, RPT_ERROR, "Frame not found in grease pencil layer"); - return; - } - - gpencil_layer_delframe(layer, frame); - - WM_main_add_notifier(NC_GPENCIL | NA_EDITED, NULL); -} - -static bGPDframe *rna_GPencil_frame_copy(bGPDlayer *layer, bGPDframe *src) -{ - bGPDframe *frame = gpencil_frame_duplicate(src); - - while (BKE_gpencil_layer_find_frame(layer, frame->framenum)) { - frame->framenum++; - } - - BLI_addtail(&layer->frames, frame); - - WM_main_add_notifier(NC_GPENCIL | NA_EDITED, NULL); - - return frame; -} - -static bGPDlayer *rna_GPencil_layer_new(bGPdata *gpd, const char *name, int setactive) -{ - bGPDlayer *gl = gpencil_layer_addnew(gpd, name, setactive); - - WM_main_add_notifier(NC_GPENCIL | ND_DATA | NA_EDITED, NULL); - - return gl; -} - -static void rna_GPencil_layer_remove(bGPdata *gpd, ReportList *reports, bGPDlayer *layer) -{ - if (BLI_findindex(&gpd->layers, layer) == -1) { - BKE_reportf(reports, RPT_ERROR, "Layer not found in grease pencil data"); - return; - } - - gpencil_layer_delete(gpd, layer); - - WM_main_add_notifier(NC_GPENCIL | ND_DATA | NA_EDITED, NULL); -} - -static void rna_GPencil_frame_clear(bGPDframe *frame) -{ - free_gpencil_strokes(frame); - - WM_main_add_notifier(NC_GPENCIL | ND_DATA | NA_EDITED, NULL); -} - -static void rna_GPencil_layer_clear(bGPDlayer *layer) -{ - free_gpencil_frames(layer); - - WM_main_add_notifier(NC_GPENCIL | ND_DATA | NA_EDITED, NULL); -} - -static void rna_GPencil_clear(bGPdata *gpd) -{ - free_gpencil_layers(&gpd->layers); - - WM_main_add_notifier(NC_GPENCIL | ND_DATA | NA_EDITED, NULL); -} - #else static void rna_def_gpencil_stroke_point(BlenderRNA *brna) @@ -274,49 +116,19 @@ static void rna_def_gpencil_stroke_point(BlenderRNA *brna) RNA_def_property_float_sdna(prop, NULL, "x"); RNA_def_property_array(prop, 3); RNA_def_property_ui_text(prop, "Coordinates", ""); - RNA_def_property_update(prop, NC_GPENCIL | ND_DATA, "rna_GPencil_update"); + RNA_def_property_update(prop, NC_SCREEN | ND_GPENCIL, NULL); prop = RNA_def_property(srna, "pressure", PROP_FLOAT, PROP_NONE); RNA_def_property_float_sdna(prop, NULL, "pressure"); RNA_def_property_range(prop, 0.0f, 1.0f); RNA_def_property_ui_text(prop, "Pressure", "Pressure of tablet at point when drawing it"); - RNA_def_property_update(prop, NC_GPENCIL | ND_DATA, "rna_GPencil_update"); -} - -static void rna_def_gpencil_stroke_points_api(BlenderRNA *brna, PropertyRNA *cprop) -{ - StructRNA *srna; - - FunctionRNA *func; - /* PropertyRNA *parm; */ - - RNA_def_property_srna(cprop, "GPencilStrokePoints"); - srna = RNA_def_struct(brna, "GPencilStrokePoints", NULL); - RNA_def_struct_sdna(srna, "bGPDstroke"); - RNA_def_struct_ui_text(srna, "Grease Pencil Stroke Points", "Collection of grease pencil stroke points"); - - func = RNA_def_function(srna, "add", "rna_GPencil_stroke_point_add"); - RNA_def_function_ui_description(func, "Add a new grease pencil stroke point"); - RNA_def_int(func, "count", 1, 0, INT_MAX, "Number", "Number of points to add to the stroke", 0, INT_MAX); - - func = RNA_def_function(srna, "pop", "rna_GPencil_stroke_point_pop"); - RNA_def_function_ui_description(func, "Remove a grease pencil stroke point"); - RNA_def_function_flag(func, FUNC_USE_REPORTS); - RNA_def_int(func, "index", -1, INT_MIN, INT_MAX, "Index", "point index", INT_MIN, INT_MAX); + RNA_def_property_update(prop, NC_SCREEN | ND_GPENCIL, NULL); } static void rna_def_gpencil_stroke(BlenderRNA *brna) { StructRNA *srna; PropertyRNA *prop; - - static EnumPropertyItem stroke_draw_mode_items[] = { - {0, "SCREEN", 0, "Screen", "Stroke is in screen-space"}, - {GP_STROKE_3DSPACE, "3DSPACE", 0, "3D Space", "Stroke is in 3D-space"}, - {GP_STROKE_2DSPACE, "2DSPACE", 0, "2D Space", "Stroke is in 2D-space"}, - {GP_STROKE_2DIMAGE, "2DIMAGE", 0, "2D Image", "Stroke is in 2D-space (but with special 'image' scaling)"}, - {0, NULL, 0, NULL, NULL} - }; srna = RNA_def_struct(brna, "GPencilStroke", NULL); RNA_def_struct_sdna(srna, "bGPDstroke"); @@ -327,45 +139,15 @@ static void rna_def_gpencil_stroke(BlenderRNA *brna) RNA_def_property_collection_sdna(prop, NULL, "points", "totpoints"); RNA_def_property_struct_type(prop, "GPencilStrokePoint"); RNA_def_property_ui_text(prop, "Stroke Points", "Stroke data points"); - rna_def_gpencil_stroke_points_api(brna, prop); - - prop = RNA_def_property(srna, "draw_mode", PROP_ENUM, PROP_NONE); - RNA_def_property_enum_bitflag_sdna(prop, NULL, "flag"); - RNA_def_property_enum_items(prop, stroke_draw_mode_items); - RNA_def_property_ui_text(prop, "Draw Mode", ""); - RNA_def_property_update(prop, 0, "rna_GPencil_update"); -} - -static void rna_def_gpencil_strokes_api(BlenderRNA *brna, PropertyRNA *cprop) -{ - StructRNA *srna; - - FunctionRNA *func; - PropertyRNA *parm; - - RNA_def_property_srna(cprop, "GPencilStrokes"); - srna = RNA_def_struct(brna, "GPencilStrokes", NULL); - RNA_def_struct_sdna(srna, "bGPDframe"); - RNA_def_struct_ui_text(srna, "Grease Pencil Frames", "Collection of grease pencil frames"); - - func = RNA_def_function(srna, "new", "rna_GPencil_stroke_new"); - RNA_def_function_ui_description(func, "Add a new grease pencil frame"); - parm = RNA_def_pointer(func, "stroke", "GPencilStroke", "", "The newly created stroke"); - RNA_def_function_return(func, parm); - - func = RNA_def_function(srna, "remove", "rna_GPencil_stroke_remove"); - RNA_def_function_ui_description(func, "Remove a grease pencil frame"); - RNA_def_function_flag(func, FUNC_USE_REPORTS); - parm = RNA_def_pointer(func, "stroke", "GPencilStroke", "Stroke", "The stroke to remove"); - RNA_def_property_flag(parm, PROP_REQUIRED | PROP_NEVER_NULL); + + /* Flags - Readonly type-info really... */ + /* TODO... */ } static void rna_def_gpencil_frame(BlenderRNA *brna) { StructRNA *srna; PropertyRNA *prop; - - FunctionRNA *func; srna = RNA_def_struct(brna, "GPencilFrame", NULL); RNA_def_struct_sdna(srna, "bGPDframe"); @@ -376,8 +158,7 @@ static void rna_def_gpencil_frame(BlenderRNA *brna) RNA_def_property_collection_sdna(prop, NULL, "strokes", NULL); RNA_def_property_struct_type(prop, "GPencilStroke"); RNA_def_property_ui_text(prop, "Strokes", "Freehand curves defining the sketch on this frame"); - rna_def_gpencil_strokes_api(brna, prop); - + /* Frame Number */ prop = RNA_def_property(srna, "frame_number", PROP_INT, PROP_NONE); RNA_def_property_int_sdna(prop, NULL, "framenum"); @@ -392,51 +173,12 @@ static void rna_def_gpencil_frame(BlenderRNA *brna) prop = RNA_def_property(srna, "select", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", GP_FRAME_SELECT); RNA_def_property_ui_text(prop, "Select", "Frame is selected for editing in the DopeSheet"); - - func = RNA_def_function(srna, "clear", "rna_GPencil_frame_clear"); - RNA_def_function_ui_description(func, "Remove all the grease pencil frame data"); -} - -static void rna_def_gpencil_frames_api(BlenderRNA *brna, PropertyRNA *cprop) -{ - StructRNA *srna; - - FunctionRNA *func; - PropertyRNA *parm; - - RNA_def_property_srna(cprop, "GPencilFrames"); - srna = RNA_def_struct(brna, "GPencilFrames", NULL); - RNA_def_struct_sdna(srna, "bGPDlayer"); - RNA_def_struct_ui_text(srna, "Grease Pencil Frames", "Collection of grease pencil frames"); - - func = RNA_def_function(srna, "new", "rna_GPencil_frame_new"); - RNA_def_function_ui_description(func, "Add a new grease pencil frame"); - RNA_def_function_flag(func, FUNC_USE_REPORTS); - parm = RNA_def_int(func, "frame_number", 1, MINFRAME, MAXFRAME, "Frame Number", "The frame on which this sketch appears", MINFRAME, MAXFRAME); - RNA_def_property_flag(parm, PROP_REQUIRED); - parm = RNA_def_pointer(func, "frame", "GPencilFrame", "", "The newly created frame"); - RNA_def_function_return(func, parm); - - func = RNA_def_function(srna, "remove", "rna_GPencil_frame_remove"); - RNA_def_function_ui_description(func, "Remove a grease pencil frame"); - RNA_def_function_flag(func, FUNC_USE_REPORTS); - parm = RNA_def_pointer(func, "frame", "GPencilFrame", "Frame", "The frame to remove"); - RNA_def_property_flag(parm, PROP_REQUIRED | PROP_NEVER_NULL); - - func = RNA_def_function(srna, "copy", "rna_GPencil_frame_copy"); - RNA_def_function_ui_description(func, "Copy a grease pencil frame"); - parm = RNA_def_pointer(func, "source", "GPencilFrame", "Source", "The source frame"); - RNA_def_property_flag(parm, PROP_REQUIRED | PROP_NEVER_NULL); - parm = RNA_def_pointer(func, "copy", "GPencilFrame", "", "The newly copied frame"); - RNA_def_function_return(func, parm); } static void rna_def_gpencil_layer(BlenderRNA *brna) { StructRNA *srna; PropertyRNA *prop; - - FunctionRNA *func; srna = RNA_def_struct(brna, "GPencilLayer", NULL); RNA_def_struct_sdna(srna, "bGPDlayer"); @@ -447,47 +189,44 @@ static void rna_def_gpencil_layer(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Info", "Layer name"); RNA_def_property_string_funcs(prop, NULL, NULL, "rna_GPencilLayer_info_set"); RNA_def_struct_name_property(srna, prop); - RNA_def_property_update(prop, NC_GPENCIL | ND_DATA, NULL); - + /* Frames */ prop = RNA_def_property(srna, "frames", PROP_COLLECTION, PROP_NONE); RNA_def_property_collection_sdna(prop, NULL, "frames", NULL); RNA_def_property_struct_type(prop, "GPencilFrame"); RNA_def_property_ui_text(prop, "Frames", "Sketches for this layer on different frames"); - rna_def_gpencil_frames_api(brna, prop); - + /* Active Frame */ prop = RNA_def_property(srna, "active_frame", PROP_POINTER, PROP_NONE); RNA_def_property_pointer_sdna(prop, NULL, "actframe"); RNA_def_property_ui_text(prop, "Active Frame", "Frame currently being displayed for this layer"); RNA_def_property_editable_func(prop, "rna_GPencilLayer_active_frame_editable"); - RNA_def_property_update(prop, NC_GPENCIL | ND_DATA, NULL); - + /* Drawing Color */ prop = RNA_def_property(srna, "color", PROP_FLOAT, PROP_COLOR_GAMMA); RNA_def_property_array(prop, 3); RNA_def_property_range(prop, 0.0f, 1.0f); RNA_def_property_ui_text(prop, "Color", "Color for all strokes in this layer"); - RNA_def_property_update(prop, NC_GPENCIL | ND_DATA, "rna_GPencil_update"); + RNA_def_property_update(prop, NC_SCREEN | ND_GPENCIL, NULL); prop = RNA_def_property(srna, "alpha", PROP_FLOAT, PROP_NONE); RNA_def_property_float_sdna(prop, NULL, "color[3]"); RNA_def_property_range(prop, 0.3, 1.0f); RNA_def_property_ui_text(prop, "Opacity", "Layer Opacity"); - RNA_def_property_update(prop, NC_GPENCIL | ND_DATA, "rna_GPencil_update"); + RNA_def_property_update(prop, NC_SCREEN | ND_GPENCIL, NULL); /* Line Thickness */ prop = RNA_def_property(srna, "line_width", PROP_INT, PROP_NONE); RNA_def_property_int_sdna(prop, NULL, "thickness"); RNA_def_property_range(prop, 1, 10); RNA_def_property_ui_text(prop, "Thickness", "Thickness of strokes (in pixels)"); - RNA_def_property_update(prop, NC_GPENCIL | ND_DATA, "rna_GPencil_update"); + RNA_def_property_update(prop, NC_SCREEN | ND_GPENCIL, NULL); /* Onion-Skinning */ prop = RNA_def_property(srna, "use_onion_skinning", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", GP_LAYER_ONIONSKIN); RNA_def_property_ui_text(prop, "Onion Skinning", "Ghost frames on either side of frame"); - RNA_def_property_update(prop, NC_GPENCIL | ND_DATA, "rna_GPencil_update"); + RNA_def_property_update(prop, NC_SCREEN | ND_GPENCIL, NULL); prop = RNA_def_property(srna, "ghost_range_max", PROP_INT, PROP_NONE); RNA_def_property_int_sdna(prop, NULL, "gstep"); @@ -495,23 +234,23 @@ static void rna_def_gpencil_layer(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Max Ghost Range", "Maximum number of frames on either side of the active frame to show " "(0 = show the 'first' available sketch on either side)"); - RNA_def_property_update(prop, NC_GPENCIL | ND_DATA, "rna_GPencil_update"); + RNA_def_property_update(prop, NC_SCREEN | ND_GPENCIL, NULL); /* Flags */ prop = RNA_def_property(srna, "hide", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", GP_LAYER_HIDE); RNA_def_property_ui_text(prop, "Hide", "Set layer Visibility"); - RNA_def_property_update(prop, NC_GPENCIL | ND_DATA, "rna_GPencil_update"); + RNA_def_property_update(prop, NC_SCREEN | ND_GPENCIL, NULL); prop = RNA_def_property(srna, "lock", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", GP_LAYER_LOCKED); RNA_def_property_ui_text(prop, "Locked", "Protect layer from further editing and/or frame changes"); - RNA_def_property_update(prop, NC_GPENCIL | ND_DATA, NULL); + RNA_def_property_update(prop, NC_SCREEN | ND_GPENCIL, NULL); prop = RNA_def_property(srna, "lock_frame", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", GP_LAYER_FRAMELOCK); RNA_def_property_ui_text(prop, "Frame Locked", "Lock current frame displayed by layer"); - RNA_def_property_update(prop, NC_GPENCIL | ND_DATA, NULL); + RNA_def_property_update(prop, NC_SCREEN | ND_GPENCIL, NULL); /* expose as layers.active */ #if 0 @@ -519,56 +258,54 @@ static void rna_def_gpencil_layer(BlenderRNA *brna) RNA_def_property_boolean_sdna(prop, NULL, "flag", GP_LAYER_ACTIVE); RNA_def_property_boolean_funcs(prop, NULL, "rna_GPencilLayer_active_set"); RNA_def_property_ui_text(prop, "Active", "Set active layer for editing"); - RNA_def_property_update(prop, NC_GPENCIL | ND_DATA, NULL); + RNA_def_property_update(prop, NC_SCREEN | ND_GPENCIL, NULL); #endif prop = RNA_def_property(srna, "select", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", GP_LAYER_SELECT); RNA_def_property_ui_text(prop, "Select", "Layer is selected for editing in the DopeSheet"); - RNA_def_property_update(prop, NC_GPENCIL | ND_DATA, NULL); + RNA_def_property_update(prop, NC_SCREEN | ND_GPENCIL, NULL); /* XXX keep this option? */ prop = RNA_def_property(srna, "show_points", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", GP_LAYER_DRAWDEBUG); RNA_def_property_ui_text(prop, "Show Points", "Draw the points which make up the strokes (for debugging purposes)"); - RNA_def_property_update_runtime(prop, "rna_GPencil_update"); + RNA_def_property_update(prop, NC_SCREEN | ND_GPENCIL, NULL); /* X-Ray */ prop = RNA_def_property(srna, "show_x_ray", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_negative_sdna(prop, NULL, "flag", GP_LAYER_NO_XRAY); RNA_def_property_ui_text(prop, "X Ray", "Make the layer draw in front of objects"); - RNA_def_property_update(prop, NC_GPENCIL | ND_DATA, "rna_GPencil_update"); - - func = RNA_def_function(srna, "clear", "rna_GPencil_layer_clear"); - RNA_def_function_ui_description(func, "Remove all the grease pencil layer data"); + RNA_def_property_update(prop, NC_SCREEN | ND_GPENCIL, NULL); } -static void rna_def_gpencil_layers_api(BlenderRNA *brna, PropertyRNA *cprop) +static void rna_def_gpencil_layers(BlenderRNA *brna, PropertyRNA *cprop) { StructRNA *srna; PropertyRNA *prop; - FunctionRNA *func; - PropertyRNA *parm; +/* FunctionRNA *func; */ +/* PropertyRNA *parm; */ RNA_def_property_srna(cprop, "GreasePencilLayers"); srna = RNA_def_struct(brna, "GreasePencilLayers", NULL); RNA_def_struct_sdna(srna, "bGPdata"); RNA_def_struct_ui_text(srna, "Grease Pencil Layers", "Collection of grease pencil layers"); +#if 0 func = RNA_def_function(srna, "new", "rna_GPencil_layer_new"); - RNA_def_function_ui_description(func, "Add a new grease pencil layer"); - parm = RNA_def_string(func, "name", "GPencilLayer", MAX_NAME, "Name", "Name of the layer"); + RNA_def_function_ui_description(func, "Add a new spline to the curve"); + parm = RNA_def_enum(func, "type", curve_type_items, CU_POLY, "", "type for the new spline"); RNA_def_property_flag(parm, PROP_REQUIRED); - RNA_def_boolean(func, "set_active", 0, "Set Active", "Set the newly created layer to the active layer"); - parm = RNA_def_pointer(func, "layer", "GPencilLayer", "", "The newly created layer"); + parm = RNA_def_pointer(func, "spline", "Spline", "", "The newly created spline"); RNA_def_function_return(func, parm); func = RNA_def_function(srna, "remove", "rna_GPencil_layer_remove"); - RNA_def_function_ui_description(func, "Remove a grease pencil layer"); + RNA_def_function_ui_description(func, "Remove a spline from a curve"); RNA_def_function_flag(func, FUNC_USE_REPORTS); - parm = RNA_def_pointer(func, "layer", "GPencilLayer", "", "The layer to remove"); + parm = RNA_def_pointer(func, "spline", "Spline", "", "The spline to remove"); RNA_def_property_flag(parm, PROP_REQUIRED | PROP_NEVER_NULL); +#endif prop = RNA_def_property(srna, "active", PROP_POINTER, PROP_NONE); RNA_def_property_struct_type(prop, "GreasePencil"); @@ -581,8 +318,7 @@ static void rna_def_gpencil_data(BlenderRNA *brna) { StructRNA *srna; PropertyRNA *prop; - FunctionRNA *func; - + static EnumPropertyItem draw_mode_items[] = { {GP_DATA_VIEWALIGN, "CURSOR", 0, "Cursor", "Draw stroke at the 3D cursor"}, {0, "VIEW", 0, "View", "Stick stroke to the view "}, /* weird, GP_DATA_VIEWALIGN is inverted */ @@ -601,22 +337,19 @@ static void rna_def_gpencil_data(BlenderRNA *brna) RNA_def_property_collection_sdna(prop, NULL, "layers", NULL); RNA_def_property_struct_type(prop, "GPencilLayer"); RNA_def_property_ui_text(prop, "Layers", ""); - rna_def_gpencil_layers_api(brna, prop); + rna_def_gpencil_layers(brna, prop); /* Flags */ prop = RNA_def_property(srna, "draw_mode", PROP_ENUM, PROP_NONE); RNA_def_property_enum_bitflag_sdna(prop, NULL, "flag"); RNA_def_property_enum_items(prop, draw_mode_items); RNA_def_property_ui_text(prop, "Draw Mode", ""); - RNA_def_property_update(prop, NC_GPENCIL | ND_DATA, NULL); prop = RNA_def_property(srna, "use_stroke_endpoints", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", GP_DATA_DEPTH_STROKE_ENDPOINTS); RNA_def_property_ui_text(prop, "Only Endpoints", "Only use the first and last parts of the stroke for snapping"); - RNA_def_property_update(prop, NC_GPENCIL | ND_DATA, NULL); - func = RNA_def_function(srna, "clear", "rna_GPencil_clear"); - RNA_def_function_ui_description(func, "Remove all the grease pencil data"); + } /* --- */ |