GPv3: Python API for frame, drawing and drawing attributes #124787
@ -28,6 +28,7 @@ struct Mesh;
|
||||
struct PointCloud;
|
||||
struct Curves;
|
||||
struct GreasePencil;
|
||||
struct GreasePencilDrawing;
|
||||
|
||||
typedef enum AttrDomainMask {
|
||||
ATTR_DOMAIN_MASK_POINT = (1 << 0),
|
||||
@ -45,6 +46,7 @@ enum class AttributeOwnerType {
|
||||
PointCloud,
|
||||
Curves,
|
||||
GreasePencil,
|
||||
GreasePencilDrawing,
|
||||
};
|
||||
|
||||
class AttributeOwner {
|
||||
@ -64,6 +66,7 @@ class AttributeOwner {
|
||||
PointCloud *get_pointcloud() const;
|
||||
Curves *get_curves() const;
|
||||
GreasePencil *get_grease_pencil() const;
|
||||
GreasePencilDrawing *get_grease_pencil_drawing() const;
|
||||
};
|
||||
|
||||
#define ATTR_DOMAIN_AS_MASK(domain) ((AttrDomainMask)((1 << (int)(domain))))
|
||||
|
@ -151,7 +151,14 @@ class Drawing : public ::GreasePencilDrawing {
|
||||
* Returns true for when this drawing has more than one user.
|
||||
*/
|
||||
bool is_instanced() const;
|
||||
/**
|
||||
* Return true if this drawing has at least one user.
|
||||
*/
|
||||
bool has_users() const;
|
||||
/**
|
||||
* Return the number of users (keyframes) of this drawing.
|
||||
*/
|
||||
int user_count() const;
|
||||
};
|
||||
static_assert(sizeof(Drawing) == sizeof(::GreasePencilDrawing));
|
||||
|
||||
@ -742,6 +749,10 @@ inline bool Drawing::has_users() const
|
||||
{
|
||||
return this->runtime->user_count.load(std::memory_order_relaxed) > 0;
|
||||
}
|
||||
inline int Drawing::user_count() const
|
||||
{
|
||||
return this->runtime->user_count.load(std::memory_order_relaxed);
|
||||
}
|
||||
|
||||
inline bool TreeNode::is_group() const
|
||||
{
|
||||
@ -1019,6 +1030,8 @@ inline bool GreasePencil::has_active_group() const
|
||||
return (this->active_node != nullptr) && (this->active_node->wrap().is_group());
|
||||
}
|
||||
|
||||
bool BKE_grease_pencil_drawing_attribute_required(const GreasePencilDrawing *, const char *name);
|
||||
|
||||
void *BKE_grease_pencil_add(Main *bmain, const char *name);
|
||||
GreasePencil *BKE_grease_pencil_new_nomain();
|
||||
GreasePencil *BKE_grease_pencil_copy_for_eval(const GreasePencil *grease_pencil_src);
|
||||
|
@ -97,6 +97,13 @@ GreasePencil *AttributeOwner::get_grease_pencil() const
|
||||
return reinterpret_cast<GreasePencil *>(ptr_);
|
||||
}
|
||||
|
||||
GreasePencilDrawing *AttributeOwner::get_grease_pencil_drawing() const
|
||||
{
|
||||
BLI_assert(this->is_valid());
|
||||
BLI_assert(type_ == AttributeOwnerType::GreasePencilDrawing);
|
||||
return reinterpret_cast<GreasePencilDrawing *>(ptr_);
|
||||
}
|
||||
|
||||
struct DomainInfo {
|
||||
CustomData *customdata = nullptr;
|
||||
int length = 0;
|
||||
@ -152,6 +159,14 @@ static std::array<DomainInfo, ATTR_DOMAIN_NUM> get_domains(const AttributeOwner
|
||||
info[int(AttrDomain::Layer)].length = grease_pencil->layers().size();
|
||||
break;
|
||||
}
|
||||
case AttributeOwnerType::GreasePencilDrawing: {
|
||||
blender::bke::greasepencil::Drawing &drawing = owner.get_grease_pencil_drawing()->wrap();
|
||||
info[int(AttrDomain::Point)].customdata = &drawing.geometry.point_data;
|
||||
info[int(AttrDomain::Point)].length = drawing.geometry.point_num;
|
||||
info[int(AttrDomain::Curve)].customdata = &drawing.geometry.curve_data;
|
||||
info[int(AttrDomain::Curve)].length = drawing.geometry.curve_num;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
return info;
|
||||
@ -182,6 +197,10 @@ static std::optional<blender::bke::MutableAttributeAccessor> get_attribute_acces
|
||||
GreasePencil &grease_pencil = *owner.get_grease_pencil();
|
||||
return grease_pencil.attributes_for_write();
|
||||
}
|
||||
case AttributeOwnerType::GreasePencilDrawing: {
|
||||
blender::bke::greasepencil::Drawing &drawing = owner.get_grease_pencil_drawing()->wrap();
|
||||
return drawing.strokes_for_write().attributes_for_write();
|
||||
}
|
||||
}
|
||||
return {};
|
||||
}
|
||||
@ -747,6 +766,8 @@ bool BKE_attribute_required(const AttributeOwner &owner, const char *name)
|
||||
return BKE_mesh_attribute_required(name);
|
||||
case AttributeOwnerType::GreasePencil:
|
||||
return false;
|
||||
case AttributeOwnerType::GreasePencilDrawing:
|
||||
return BKE_grease_pencil_drawing_attribute_required(owner.get_grease_pencil_drawing(), name);
|
||||
}
|
||||
return false;
|
||||
}
|
||||
@ -809,6 +830,9 @@ int *BKE_attributes_active_index_p(AttributeOwner &owner)
|
||||
case AttributeOwnerType::GreasePencil: {
|
||||
return &(owner.get_grease_pencil())->attributes_active_index;
|
||||
}
|
||||
case AttributeOwnerType::GreasePencilDrawing: {
|
||||
return &(owner.get_grease_pencil_drawing())->geometry.attributes_active_index;
|
||||
}
|
||||
}
|
||||
return nullptr;
|
||||
}
|
||||
|
@ -71,6 +71,8 @@ using blender::Span;
|
||||
using blender::uint3;
|
||||
using blender::VectorSet;
|
||||
|
||||
static const char *ATTR_POSITION = "position";
|
||||
|
||||
/* Forward declarations. */
|
||||
static void read_drawing_array(GreasePencil &grease_pencil, BlendDataReader *reader);
|
||||
static void write_drawing_array(GreasePencil &grease_pencil, BlendWriter *writer);
|
||||
@ -1754,6 +1756,12 @@ std::optional<MutableSpan<float3>> GreasePencilDrawingEditHints::positions_for_w
|
||||
/** \name Grease Pencil kernel functions
|
||||
* \{ */
|
||||
|
||||
bool BKE_grease_pencil_drawing_attribute_required(const GreasePencilDrawing * /*drawing*/,
|
||||
const char *name)
|
||||
{
|
||||
return STREQ(name, ATTR_POSITION);
|
||||
}
|
||||
|
||||
void *BKE_grease_pencil_add(Main *bmain, const char *name)
|
||||
{
|
||||
GreasePencil *grease_pencil = reinterpret_cast<GreasePencil *>(BKE_id_new(bmain, ID_GP, name));
|
||||
|
@ -120,6 +120,7 @@ set(APISRC
|
||||
rna_camera_api.cc
|
||||
rna_curve_api.cc
|
||||
rna_fcurve_api.cc
|
||||
rna_grease_pencil_api.cc
|
||||
rna_image_api.cc
|
||||
rna_lattice_api.cc
|
||||
rna_main_api.cc
|
||||
|
@ -4815,7 +4815,7 @@ static RNAProcessItem PROCESS_ITEMS[] = {
|
||||
{"rna_dynamicpaint.cc", nullptr, RNA_def_dynamic_paint},
|
||||
{"rna_fcurve.cc", "rna_fcurve_api.cc", RNA_def_fcurve},
|
||||
{"rna_annotations.cc", nullptr, RNA_def_annotations},
|
||||
{"rna_grease_pencil.cc", nullptr, RNA_def_grease_pencil},
|
||||
{"rna_grease_pencil.cc", "rna_grease_pencil_api.cc", RNA_def_grease_pencil},
|
||||
{"rna_curves.cc", nullptr, RNA_def_curves},
|
||||
{"rna_image.cc", "rna_image_api.cc", RNA_def_image},
|
||||
{"rna_key.cc", nullptr, RNA_def_key},
|
||||
|
@ -16,6 +16,7 @@
|
||||
|
||||
#include "DNA_curves_types.h"
|
||||
#include "DNA_customdata_types.h"
|
||||
#include "DNA_grease_pencil_types.h"
|
||||
#include "DNA_mesh_types.h"
|
||||
#include "DNA_meshdata_types.h"
|
||||
#include "DNA_pointcloud_types.h"
|
||||
@ -185,18 +186,49 @@ const EnumPropertyItem rna_enum_attribute_curves_domain_items[] = {
|
||||
|
||||
static AttributeOwner owner_from_attribute_pointer_rna(PointerRNA *ptr)
|
||||
{
|
||||
ID *id = ptr->owner_id;
|
||||
/* TODO: For non-ID attribute owners, iterate through the ID and find the owner that owns the
|
||||
* `CustomDataLayer` that points to `ptr->data`. */
|
||||
return AttributeOwner::from_id(id);
|
||||
ID *owner_id = ptr->owner_id;
|
||||
const CustomDataLayer *layer = static_cast<const CustomDataLayer *>(ptr->data);
|
||||
/* TODO: Because we don't know the path to the `ptr`, we need to look though all possible
|
||||
* candidates and search for the `layer` currently. This should be just a simple lookup. */
|
||||
if (GS(owner_id->name) == ID_GP) {
|
||||
GreasePencil *grease_pencil = reinterpret_cast<GreasePencil *>(owner_id);
|
||||
/* First check the layer attributes. */
|
||||
CustomData *layers_data = &grease_pencil->layers_data;
|
||||
for (int i = 0; i < layers_data->totlayer; i++) {
|
||||
if (&layers_data->layers[i] == layer) {
|
||||
return AttributeOwner(AttributeOwnerType::GreasePencil, grease_pencil);
|
||||
}
|
||||
}
|
||||
/* Now check all the drawings. */
|
||||
for (GreasePencilDrawingBase *base : grease_pencil->drawings()) {
|
||||
if (base->type == GP_DRAWING) {
|
||||
GreasePencilDrawing *drawing = reinterpret_cast<GreasePencilDrawing *>(base);
|
||||
CustomData *curve_data = &drawing->geometry.curve_data;
|
||||
for (int i = 0; i < curve_data->totlayer; i++) {
|
||||
if (&curve_data->layers[i] == layer) {
|
||||
return AttributeOwner(AttributeOwnerType::GreasePencilDrawing, drawing);
|
||||
}
|
||||
}
|
||||
CustomData *point_data = &drawing->geometry.point_data;
|
||||
for (int i = 0; i < point_data->totlayer; i++) {
|
||||
if (&point_data->layers[i] == layer) {
|
||||
return AttributeOwner(AttributeOwnerType::GreasePencilDrawing, drawing);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
return AttributeOwner::from_id(owner_id);
|
||||
}
|
||||
|
||||
static AttributeOwner owner_from_pointer_rna(PointerRNA *ptr)
|
||||
{
|
||||
ID *id = ptr->owner_id;
|
||||
/* TODO: For non-ID attribute owners, check the `ptr->type` to derive the `AttributeOwnerType`
|
||||
/* For non-ID attribute owners, check the `ptr->type` to derive the `AttributeOwnerType`
|
||||
* and construct an `AttributeOwner` from that type and `ptr->data`. */
|
||||
return AttributeOwner::from_id(id);
|
||||
if (ptr->type == &RNA_GreasePencilDrawing) {
|
||||
return AttributeOwner(AttributeOwnerType::GreasePencilDrawing, ptr->data);
|
||||
}
|
||||
return AttributeOwner::from_id(ptr->owner_id);
|
||||
}
|
||||
|
||||
static std::optional<std::string> rna_Attribute_path(const PointerRNA *ptr)
|
||||
@ -456,7 +488,7 @@ static void rna_StringAttributeValue_s_set(PointerRNA *ptr, const char *value)
|
||||
|
||||
/* Attribute Group */
|
||||
|
||||
static PointerRNA rna_AttributeGroup_new(
|
||||
static PointerRNA rna_AttributeGroupID_new(
|
||||
ID *id, ReportList *reports, const char *name, const int type, const int domain)
|
||||
{
|
||||
AttributeOwner owner = AttributeOwner::from_id(id);
|
||||
@ -484,7 +516,7 @@ static PointerRNA rna_AttributeGroup_new(
|
||||
return ptr;
|
||||
}
|
||||
|
||||
static void rna_AttributeGroup_remove(ID *id, ReportList *reports, PointerRNA *attribute_ptr)
|
||||
static void rna_AttributeGroupID_remove(ID *id, ReportList *reports, PointerRNA *attribute_ptr)
|
||||
{
|
||||
AttributeOwner owner = AttributeOwner::from_id(id);
|
||||
const CustomDataLayer *layer = (const CustomDataLayer *)attribute_ptr->data;
|
||||
@ -604,40 +636,40 @@ int rna_AttributeGroup_length(PointerRNA *ptr)
|
||||
return BKE_attributes_length(owner, ATTR_DOMAIN_MASK_ALL, CD_MASK_PROP_ALL);
|
||||
}
|
||||
|
||||
static int rna_AttributeGroup_active_index_get(PointerRNA *ptr)
|
||||
static int rna_AttributeGroupID_active_index_get(PointerRNA *ptr)
|
||||
{
|
||||
AttributeOwner owner = owner_from_pointer_rna(ptr);
|
||||
AttributeOwner owner = AttributeOwner::from_id(ptr->owner_id);
|
||||
return *BKE_attributes_active_index_p(owner);
|
||||
}
|
||||
|
||||
static PointerRNA rna_AttributeGroup_active_get(PointerRNA *ptr)
|
||||
static PointerRNA rna_AttributeGroupID_active_get(PointerRNA *ptr)
|
||||
{
|
||||
AttributeOwner owner = owner_from_pointer_rna(ptr);
|
||||
AttributeOwner owner = AttributeOwner::from_id(ptr->owner_id);
|
||||
CustomDataLayer *layer = BKE_attributes_active_get(owner);
|
||||
|
||||
PointerRNA attribute_ptr = RNA_pointer_create(ptr->owner_id, &RNA_Attribute, layer);
|
||||
return attribute_ptr;
|
||||
}
|
||||
|
||||
static void rna_AttributeGroup_active_set(PointerRNA *ptr,
|
||||
PointerRNA attribute_ptr,
|
||||
ReportList * /*reports*/)
|
||||
static void rna_AttributeGroupID_active_set(PointerRNA *ptr,
|
||||
PointerRNA attribute_ptr,
|
||||
ReportList * /*reports*/)
|
||||
{
|
||||
AttributeOwner owner = owner_from_pointer_rna(ptr);
|
||||
AttributeOwner owner = AttributeOwner::from_id(ptr->owner_id);
|
||||
CustomDataLayer *layer = static_cast<CustomDataLayer *>(attribute_ptr.data);
|
||||
BKE_attributes_active_set(owner, layer->name);
|
||||
}
|
||||
|
||||
static void rna_AttributeGroup_active_index_set(PointerRNA *ptr, int value)
|
||||
static void rna_AttributeGroupID_active_index_set(PointerRNA *ptr, int value)
|
||||
{
|
||||
AttributeOwner owner = owner_from_pointer_rna(ptr);
|
||||
AttributeOwner owner = AttributeOwner::from_id(ptr->owner_id);
|
||||
*BKE_attributes_active_index_p(owner) = value;
|
||||
}
|
||||
|
||||
static void rna_AttributeGroup_active_index_range(
|
||||
static void rna_AttributeGroupID_active_index_range(
|
||||
PointerRNA *ptr, int *min, int *max, int *softmin, int *softmax)
|
||||
{
|
||||
AttributeOwner owner = owner_from_pointer_rna(ptr);
|
||||
AttributeOwner owner = AttributeOwner::from_id(ptr->owner_id);
|
||||
*min = 0;
|
||||
*max = BKE_attributes_length(owner, ATTR_DOMAIN_MASK_ALL, CD_MASK_PROP_ALL);
|
||||
|
||||
@ -650,65 +682,6 @@ static void rna_AttributeGroup_update_active(Main *bmain, Scene *scene, PointerR
|
||||
rna_Attribute_update_data(bmain, scene, ptr);
|
||||
}
|
||||
|
||||
static PointerRNA rna_AttributeGroup_active_color_get(PointerRNA *ptr)
|
||||
{
|
||||
AttributeOwner owner = AttributeOwner::from_id(ptr->owner_id);
|
||||
CustomDataLayer *layer = BKE_attribute_search_for_write(
|
||||
owner,
|
||||
BKE_id_attributes_active_color_name(ptr->owner_id),
|
||||
CD_MASK_COLOR_ALL,
|
||||
ATTR_DOMAIN_MASK_COLOR);
|
||||
|
||||
PointerRNA attribute_ptr = RNA_pointer_create(ptr->owner_id, &RNA_Attribute, layer);
|
||||
return attribute_ptr;
|
||||
}
|
||||
|
||||
static void rna_AttributeGroup_active_color_set(PointerRNA *ptr,
|
||||
PointerRNA attribute_ptr,
|
||||
ReportList * /*reports*/)
|
||||
{
|
||||
ID *id = ptr->owner_id;
|
||||
CustomDataLayer *layer = static_cast<CustomDataLayer *>(attribute_ptr.data);
|
||||
BKE_id_attributes_active_color_set(id, layer->name);
|
||||
}
|
||||
|
||||
static int rna_AttributeGroup_active_color_index_get(PointerRNA *ptr)
|
||||
{
|
||||
AttributeOwner owner = AttributeOwner::from_id(ptr->owner_id);
|
||||
const CustomDataLayer *layer = BKE_attribute_search(
|
||||
owner,
|
||||
BKE_id_attributes_active_color_name(ptr->owner_id),
|
||||
CD_MASK_COLOR_ALL,
|
||||
ATTR_DOMAIN_MASK_COLOR);
|
||||
|
||||
return BKE_attribute_to_index(owner, layer, ATTR_DOMAIN_MASK_COLOR, CD_MASK_COLOR_ALL);
|
||||
}
|
||||
|
||||
static void rna_AttributeGroup_active_color_index_set(PointerRNA *ptr, int value)
|
||||
{
|
||||
AttributeOwner owner = AttributeOwner::from_id(ptr->owner_id);
|
||||
CustomDataLayer *layer = BKE_attribute_from_index(
|
||||
owner, value, ATTR_DOMAIN_MASK_COLOR, CD_MASK_COLOR_ALL);
|
||||
|
||||
if (!layer) {
|
||||
fprintf(stderr, "%s: error setting active color index to %d\n", __func__, value);
|
||||
return;
|
||||
}
|
||||
|
||||
BKE_id_attributes_active_color_set(ptr->owner_id, layer->name);
|
||||
}
|
||||
|
||||
static void rna_AttributeGroup_active_color_index_range(
|
||||
PointerRNA *ptr, int *min, int *max, int *softmin, int *softmax)
|
||||
{
|
||||
AttributeOwner owner = AttributeOwner::from_id(ptr->owner_id);
|
||||
*min = 0;
|
||||
*max = BKE_attributes_length(owner, ATTR_DOMAIN_MASK_COLOR, CD_MASK_COLOR_ALL);
|
||||
|
||||
*softmin = *min;
|
||||
*softmax = *max;
|
||||
}
|
||||
|
||||
static void rna_AttributeGroup_update_active_color(Main * /*bmain*/,
|
||||
Scene * /*scene*/,
|
||||
PointerRNA *ptr)
|
||||
@ -722,7 +695,66 @@ static void rna_AttributeGroup_update_active_color(Main * /*bmain*/,
|
||||
}
|
||||
}
|
||||
|
||||
static int rna_AttributeGroup_render_color_index_get(PointerRNA *ptr)
|
||||
static PointerRNA rna_AttributeGroupMesh_active_color_get(PointerRNA *ptr)
|
||||
{
|
||||
AttributeOwner owner = AttributeOwner::from_id(ptr->owner_id);
|
||||
CustomDataLayer *layer = BKE_attribute_search_for_write(
|
||||
owner,
|
||||
BKE_id_attributes_active_color_name(ptr->owner_id),
|
||||
CD_MASK_COLOR_ALL,
|
||||
ATTR_DOMAIN_MASK_COLOR);
|
||||
|
||||
PointerRNA attribute_ptr = RNA_pointer_create(ptr->owner_id, &RNA_Attribute, layer);
|
||||
return attribute_ptr;
|
||||
}
|
||||
|
||||
static void rna_AttributeGroupMesh_active_color_set(PointerRNA *ptr,
|
||||
PointerRNA attribute_ptr,
|
||||
ReportList * /*reports*/)
|
||||
{
|
||||
ID *id = ptr->owner_id;
|
||||
CustomDataLayer *layer = static_cast<CustomDataLayer *>(attribute_ptr.data);
|
||||
BKE_id_attributes_active_color_set(id, layer->name);
|
||||
}
|
||||
|
||||
static int rna_AttributeGroupMesh_active_color_index_get(PointerRNA *ptr)
|
||||
{
|
||||
AttributeOwner owner = AttributeOwner::from_id(ptr->owner_id);
|
||||
const CustomDataLayer *layer = BKE_attribute_search(
|
||||
owner,
|
||||
BKE_id_attributes_active_color_name(ptr->owner_id),
|
||||
CD_MASK_COLOR_ALL,
|
||||
ATTR_DOMAIN_MASK_COLOR);
|
||||
|
||||
return BKE_attribute_to_index(owner, layer, ATTR_DOMAIN_MASK_COLOR, CD_MASK_COLOR_ALL);
|
||||
}
|
||||
|
||||
static void rna_AttributeGroupMesh_active_color_index_set(PointerRNA *ptr, int value)
|
||||
{
|
||||
AttributeOwner owner = AttributeOwner::from_id(ptr->owner_id);
|
||||
CustomDataLayer *layer = BKE_attribute_from_index(
|
||||
owner, value, ATTR_DOMAIN_MASK_COLOR, CD_MASK_COLOR_ALL);
|
||||
|
||||
if (!layer) {
|
||||
fprintf(stderr, "%s: error setting active color index to %d\n", __func__, value);
|
||||
return;
|
||||
}
|
||||
|
||||
BKE_id_attributes_active_color_set(ptr->owner_id, layer->name);
|
||||
}
|
||||
filedescriptor marked this conversation as resolved
Outdated
|
||||
|
||||
static void rna_AttributeGroupMesh_active_color_index_range(
|
||||
PointerRNA *ptr, int *min, int *max, int *softmin, int *softmax)
|
||||
{
|
||||
AttributeOwner owner = AttributeOwner::from_id(ptr->owner_id);
|
||||
*min = 0;
|
||||
*max = BKE_attributes_length(owner, ATTR_DOMAIN_MASK_COLOR, CD_MASK_COLOR_ALL);
|
||||
|
||||
*softmin = *min;
|
||||
*softmax = *max;
|
||||
}
|
||||
|
||||
static int rna_AttributeGroupMesh_render_color_index_get(PointerRNA *ptr)
|
||||
{
|
||||
AttributeOwner owner = AttributeOwner::from_id(ptr->owner_id);
|
||||
const CustomDataLayer *layer = BKE_id_attributes_color_find(
|
||||
@ -731,7 +763,7 @@ static int rna_AttributeGroup_render_color_index_get(PointerRNA *ptr)
|
||||
return BKE_attribute_to_index(owner, layer, ATTR_DOMAIN_MASK_COLOR, CD_MASK_COLOR_ALL);
|
||||
}
|
||||
|
||||
static void rna_AttributeGroup_render_color_index_set(PointerRNA *ptr, int value)
|
||||
static void rna_AttributeGroupMesh_render_color_index_set(PointerRNA *ptr, int value)
|
||||
{
|
||||
AttributeOwner owner = AttributeOwner::from_id(ptr->owner_id);
|
||||
CustomDataLayer *layer = BKE_attribute_from_index(
|
||||
@ -745,7 +777,7 @@ static void rna_AttributeGroup_render_color_index_set(PointerRNA *ptr, int value
|
||||
BKE_id_attributes_default_color_set(ptr->owner_id, layer->name);
|
||||
}
|
||||
|
||||
static void rna_AttributeGroup_render_color_index_range(
|
||||
static void rna_AttributeGroupMesh_render_color_index_range(
|
||||
PointerRNA *ptr, int *min, int *max, int *softmin, int *softmax)
|
||||
{
|
||||
AttributeOwner owner = AttributeOwner::from_id(ptr->owner_id);
|
||||
@ -756,7 +788,7 @@ static void rna_AttributeGroup_render_color_index_range(
|
||||
*softmax = *max;
|
||||
}
|
||||
|
||||
static void rna_AttributeGroup_default_color_name_get(PointerRNA *ptr, char *value)
|
||||
static void rna_AttributeGroupMesh_default_color_name_get(PointerRNA *ptr, char *value)
|
||||
{
|
||||
const ID *id = ptr->owner_id;
|
||||
const char *name = BKE_id_attributes_default_color_name(id);
|
||||
@ -767,14 +799,14 @@ static void rna_AttributeGroup_default_color_name_get(PointerRNA *ptr, char *val
|
||||
strcpy(value, name);
|
||||
}
|
||||
|
||||
static int rna_AttributeGroup_default_color_name_length(PointerRNA *ptr)
|
||||
static int rna_AttributeGroupMesh_default_color_name_length(PointerRNA *ptr)
|
||||
{
|
||||
const ID *id = ptr->owner_id;
|
||||
const char *name = BKE_id_attributes_default_color_name(id);
|
||||
return name ? strlen(name) : 0;
|
||||
}
|
||||
|
||||
static void rna_AttributeGroup_default_color_name_set(PointerRNA *ptr, const char *value)
|
||||
static void rna_AttributeGroupMesh_default_color_name_set(PointerRNA *ptr, const char *value)
|
||||
{
|
||||
ID *id = ptr->owner_id;
|
||||
if (GS(id->name) == ID_ME) {
|
||||
@ -786,7 +818,7 @@ static void rna_AttributeGroup_default_color_name_set(PointerRNA *ptr, const cha
|
||||
}
|
||||
}
|
||||
|
||||
static void rna_AttributeGroup_active_color_name_get(PointerRNA *ptr, char *value)
|
||||
static void rna_AttributeGroupMesh_active_color_name_get(PointerRNA *ptr, char *value)
|
||||
{
|
||||
const ID *id = ptr->owner_id;
|
||||
const char *name = BKE_id_attributes_active_color_name(id);
|
||||
@ -797,14 +829,14 @@ static void rna_AttributeGroup_active_color_name_get(PointerRNA *ptr, char *valu
|
||||
strcpy(value, name);
|
||||
}
|
||||
|
||||
static int rna_AttributeGroup_active_color_name_length(PointerRNA *ptr)
|
||||
static int rna_AttributeGroupMesh_active_color_name_length(PointerRNA *ptr)
|
||||
{
|
||||
const ID *id = ptr->owner_id;
|
||||
const char *name = BKE_id_attributes_active_color_name(id);
|
||||
return name ? strlen(name) : 0;
|
||||
}
|
||||
|
||||
static void rna_AttributeGroup_active_color_name_set(PointerRNA *ptr, const char *value)
|
||||
static void rna_AttributeGroupMesh_active_color_name_set(PointerRNA *ptr, const char *value)
|
||||
{
|
||||
ID *id = ptr->owner_id;
|
||||
if (GS(id->name) == ID_ME) {
|
||||
@ -816,6 +848,96 @@ static void rna_AttributeGroup_active_color_name_set(PointerRNA *ptr, const char
|
||||
}
|
||||
}
|
||||
|
||||
static PointerRNA rna_AttributeGroupGreasePencilDrawing_new(ID *grease_pencil_id,
|
||||
GreasePencilDrawing *drawing,
|
||||
ReportList *reports,
|
||||
const char *name,
|
||||
const int type,
|
||||
const int domain)
|
||||
{
|
||||
AttributeOwner owner = AttributeOwner(AttributeOwnerType::GreasePencilDrawing, drawing);
|
||||
CustomDataLayer *layer = BKE_attribute_new(
|
||||
owner, name, eCustomDataType(type), AttrDomain(domain), reports);
|
||||
|
||||
if (!layer) {
|
||||
return PointerRNA_NULL;
|
||||
}
|
||||
|
||||
DEG_id_tag_update(grease_pencil_id, ID_RECALC_GEOMETRY);
|
||||
WM_main_add_notifier(NC_GEOM | ND_DATA, grease_pencil_id);
|
||||
|
||||
PointerRNA ptr = RNA_pointer_create(grease_pencil_id, &RNA_Attribute, layer);
|
||||
return ptr;
|
||||
}
|
||||
|
||||
static void rna_AttributeGroupGreasePencilDrawing_remove(ID *grease_pencil_id,
|
||||
GreasePencilDrawing *drawing,
|
||||
ReportList *reports,
|
||||
PointerRNA *attribute_ptr)
|
||||
{
|
||||
AttributeOwner owner = AttributeOwner(AttributeOwnerType::GreasePencilDrawing, drawing);
|
||||
const CustomDataLayer *layer = (const CustomDataLayer *)attribute_ptr->data;
|
||||
BKE_attribute_remove(owner, layer->name, reports);
|
||||
RNA_POINTER_INVALIDATE(attribute_ptr);
|
||||
|
||||
DEG_id_tag_update(grease_pencil_id, ID_RECALC_GEOMETRY);
|
||||
WM_main_add_notifier(NC_GEOM | ND_DATA, grease_pencil_id);
|
||||
}
|
||||
|
||||
static PointerRNA rna_AttributeGroupGreasePencilDrawing_active_get(PointerRNA *ptr)
|
||||
{
|
||||
GreasePencilDrawing *drawing = static_cast<GreasePencilDrawing *>(ptr->data);
|
||||
AttributeOwner owner = AttributeOwner(AttributeOwnerType::GreasePencilDrawing, drawing);
|
||||
CustomDataLayer *layer = BKE_attributes_active_get(owner);
|
||||
|
||||
PointerRNA attribute_ptr = RNA_pointer_create(ptr->owner_id, &RNA_Attribute, layer);
|
||||
return attribute_ptr;
|
||||
}
|
||||
|
||||
static void rna_AttributeGroupGreasePencilDrawing_active_set(PointerRNA *ptr,
|
||||
PointerRNA attribute_ptr,
|
||||
ReportList * /*reports*/)
|
||||
{
|
||||
GreasePencilDrawing *drawing = static_cast<GreasePencilDrawing *>(ptr->data);
|
||||
AttributeOwner owner = AttributeOwner(AttributeOwnerType::GreasePencilDrawing, drawing);
|
||||
CustomDataLayer *layer = static_cast<CustomDataLayer *>(attribute_ptr.data);
|
||||
BKE_attributes_active_set(owner, layer->name);
|
||||
}
|
||||
|
||||
static bool rna_AttributeGroupGreasePencilDrawing_active_poll(PointerRNA *ptr,
|
||||
const PointerRNA value)
|
||||
{
|
||||
AttributeOwner owner = owner_from_attribute_pointer_rna(const_cast<PointerRNA *>(&value));
|
||||
filedescriptor marked this conversation as resolved
Outdated
Jacques Lucke
commented
```
In file included from /home/jacques/blender/build_debug/source/blender/makesrna/intern/rna_attribute_gen.cc:36:
/home/jacques/blender/blender/source/blender/makesrna/intern/rna_attribute.cc: In function ‘bool rna_AttributeGroupGreasePencilDrawing_active_poll(PointerRNA*, PointerRNA)’:
/home/jacques/blender/blender/source/blender/makesrna/intern/rna_attribute.cc:910:59: error: invalid conversion from ‘const PointerRNA*’ to ‘PointerRNA*’ [-fpermissive]
910 | AttributeOwner owner = owner_from_attribute_pointer_rna(&value);
| ^~~~~~
| |
| const PointerRNA*
/home/jacques/blender/blender/source/blender/makesrna/intern/rna_attribute.cc:187:68: note: initializing argument 1 of ‘AttributeOwner owner_from_attribute_pointer_rna(PointerRNA*)’
187 | static AttributeOwner owner_from_attribute_pointer_rna(PointerRNA *ptr)
| ~~~~~~~~~~~~^~~
```
Falk David
commented
Sorry about that, fixed now. Sorry about that, fixed now.
|
||||
return owner.is_valid() && owner.type() == AttributeOwnerType::GreasePencilDrawing &&
|
||||
owner.get_grease_pencil_drawing() == static_cast<GreasePencilDrawing *>(ptr->data);
|
||||
}
|
||||
|
||||
static int rna_AttributeGroupGreasePencilDrawing_active_index_get(PointerRNA *ptr)
|
||||
{
|
||||
GreasePencilDrawing *drawing = static_cast<GreasePencilDrawing *>(ptr->data);
|
||||
AttributeOwner owner = AttributeOwner(AttributeOwnerType::GreasePencilDrawing, drawing);
|
||||
return *BKE_attributes_active_index_p(owner);
|
||||
}
|
||||
|
||||
static void rna_AttributeGroupGreasePencilDrawing_active_index_set(PointerRNA *ptr, int value)
|
||||
{
|
||||
GreasePencilDrawing *drawing = static_cast<GreasePencilDrawing *>(ptr->data);
|
||||
AttributeOwner owner = AttributeOwner(AttributeOwnerType::GreasePencilDrawing, drawing);
|
||||
*BKE_attributes_active_index_p(owner) = value;
|
||||
}
|
||||
|
||||
static void rna_AttributeGroupGreasePencilDrawing_active_index_range(
|
||||
PointerRNA *ptr, int *min, int *max, int *softmin, int *softmax)
|
||||
{
|
||||
GreasePencilDrawing *drawing = static_cast<GreasePencilDrawing *>(ptr->data);
|
||||
AttributeOwner owner = AttributeOwner(AttributeOwnerType::GreasePencilDrawing, drawing);
|
||||
*min = 0;
|
||||
*max = BKE_attributes_length(owner, ATTR_DOMAIN_MASK_ALL, CD_MASK_PROP_ALL);
|
||||
|
||||
*softmin = *min;
|
||||
*softmax = *max;
|
||||
}
|
||||
|
||||
#else
|
||||
|
||||
static void rna_def_attribute_float(BlenderRNA *brna)
|
||||
@ -1315,7 +1437,7 @@ static void rna_def_attribute_group_id_common(StructRNA *srna)
|
||||
PropertyRNA *parm;
|
||||
|
||||
/* API */
|
||||
func = RNA_def_function(srna, "new", "rna_AttributeGroup_new");
|
||||
func = RNA_def_function(srna, "new", "rna_AttributeGroupID_new");
|
||||
RNA_def_function_ui_description(func, "Add attribute to geometry");
|
||||
RNA_def_function_flag(func, FUNC_USE_REPORTS);
|
||||
parm = RNA_def_string(func, "name", "Attribute", 0, "Name", "Name of geometry attribute");
|
||||
@ -1337,7 +1459,7 @@ static void rna_def_attribute_group_id_common(StructRNA *srna)
|
||||
RNA_def_parameter_flags(parm, PropertyFlag(0), PARM_RNAPTR);
|
||||
RNA_def_function_return(func, parm);
|
||||
|
||||
func = RNA_def_function(srna, "remove", "rna_AttributeGroup_remove");
|
||||
func = RNA_def_function(srna, "remove", "rna_AttributeGroupID_remove");
|
||||
RNA_def_function_ui_description(func, "Remove attribute from geometry");
|
||||
RNA_def_function_flag(func, FUNC_USE_REPORTS);
|
||||
parm = RNA_def_pointer(func, "attribute", "Attribute", "", "Geometry Attribute");
|
||||
@ -1348,8 +1470,11 @@ static void rna_def_attribute_group_id_common(StructRNA *srna)
|
||||
prop = RNA_def_property(srna, "active", PROP_POINTER, PROP_NONE);
|
||||
RNA_def_property_struct_type(prop, "Attribute");
|
||||
RNA_def_property_ui_text(prop, "Active Attribute", "Active attribute");
|
||||
RNA_def_property_pointer_funcs(
|
||||
prop, "rna_AttributeGroup_active_get", "rna_AttributeGroup_active_set", nullptr, nullptr);
|
||||
RNA_def_property_pointer_funcs(prop,
|
||||
"rna_AttributeGroupID_active_get",
|
||||
"rna_AttributeGroupID_active_set",
|
||||
nullptr,
|
||||
nullptr);
|
||||
RNA_def_property_flag(prop, PROP_EDITABLE | PROP_NEVER_UNLINK);
|
||||
RNA_def_property_update(prop, 0, "rna_AttributeGroup_update_active");
|
||||
|
||||
@ -1357,9 +1482,9 @@ static void rna_def_attribute_group_id_common(StructRNA *srna)
|
||||
RNA_def_property_ui_text(prop, "Active Attribute Index", "Active attribute index");
|
||||
RNA_def_property_clear_flag(prop, PROP_ANIMATABLE);
|
||||
RNA_def_property_int_funcs(prop,
|
||||
"rna_AttributeGroup_active_index_get",
|
||||
"rna_AttributeGroup_active_index_set",
|
||||
"rna_AttributeGroup_active_index_range");
|
||||
"rna_AttributeGroupID_active_index_get",
|
||||
"rna_AttributeGroupID_active_index_set",
|
||||
"rna_AttributeGroupID_active_index_range");
|
||||
RNA_def_property_update(prop, 0, "rna_AttributeGroup_update_active");
|
||||
}
|
||||
|
||||
@ -1380,8 +1505,8 @@ static void rna_def_attribute_group_mesh(BlenderRNA *brna)
|
||||
RNA_def_property_struct_type(prop, "Attribute");
|
||||
RNA_def_property_ui_text(prop, "Active Color", "Active color attribute for display and editing");
|
||||
RNA_def_property_pointer_funcs(prop,
|
||||
"rna_AttributeGroup_active_color_get",
|
||||
"rna_AttributeGroup_active_color_set",
|
||||
"rna_AttributeGroupMesh_active_color_get",
|
||||
"rna_AttributeGroupMesh_active_color_set",
|
||||
nullptr,
|
||||
nullptr);
|
||||
RNA_def_property_flag(prop, PROP_EDITABLE | PROP_NEVER_UNLINK);
|
||||
@ -1391,9 +1516,9 @@ static void rna_def_attribute_group_mesh(BlenderRNA *brna)
|
||||
RNA_def_property_ui_text(prop, "Active Color Index", "Active color attribute index");
|
||||
RNA_def_property_clear_flag(prop, PROP_ANIMATABLE);
|
||||
RNA_def_property_int_funcs(prop,
|
||||
"rna_AttributeGroup_active_color_index_get",
|
||||
"rna_AttributeGroup_active_color_index_set",
|
||||
"rna_AttributeGroup_active_color_index_range");
|
||||
"rna_AttributeGroupMesh_active_color_index_get",
|
||||
"rna_AttributeGroupMesh_active_color_index_set",
|
||||
"rna_AttributeGroupMesh_active_color_index_range");
|
||||
RNA_def_property_update(prop, 0, "rna_AttributeGroup_update_active_color");
|
||||
|
||||
prop = RNA_def_property(srna, "render_color_index", PROP_INT, PROP_NONE);
|
||||
@ -1402,17 +1527,17 @@ static void rna_def_attribute_group_mesh(BlenderRNA *brna)
|
||||
"The index of the color attribute used as a fallback for rendering");
|
||||
RNA_def_property_clear_flag(prop, PROP_ANIMATABLE);
|
||||
RNA_def_property_int_funcs(prop,
|
||||
"rna_AttributeGroup_render_color_index_get",
|
||||
"rna_AttributeGroup_render_color_index_set",
|
||||
"rna_AttributeGroup_render_color_index_range");
|
||||
"rna_AttributeGroupMesh_render_color_index_get",
|
||||
"rna_AttributeGroupMesh_render_color_index_set",
|
||||
"rna_AttributeGroupMesh_render_color_index_range");
|
||||
RNA_def_property_update(prop, 0, "rna_AttributeGroup_update_active_color");
|
||||
|
||||
prop = RNA_def_property(srna, "default_color_name", PROP_STRING, PROP_NONE);
|
||||
RNA_def_property_string_maxlength(prop, MAX_CUSTOMDATA_LAYER_NAME_NO_PREFIX);
|
||||
RNA_def_property_string_funcs(prop,
|
||||
"rna_AttributeGroup_default_color_name_get",
|
||||
"rna_AttributeGroup_default_color_name_length",
|
||||
"rna_AttributeGroup_default_color_name_set");
|
||||
"rna_AttributeGroupMesh_default_color_name_get",
|
||||
"rna_AttributeGroupMesh_default_color_name_length",
|
||||
"rna_AttributeGroupMesh_default_color_name_set");
|
||||
RNA_def_property_ui_text(
|
||||
prop,
|
||||
"Default Color Attribute",
|
||||
@ -1421,9 +1546,9 @@ static void rna_def_attribute_group_mesh(BlenderRNA *brna)
|
||||
prop = RNA_def_property(srna, "active_color_name", PROP_STRING, PROP_NONE);
|
||||
RNA_def_property_string_maxlength(prop, MAX_CUSTOMDATA_LAYER_NAME_NO_PREFIX);
|
||||
RNA_def_property_string_funcs(prop,
|
||||
"rna_AttributeGroup_active_color_name_get",
|
||||
"rna_AttributeGroup_active_color_name_length",
|
||||
"rna_AttributeGroup_active_color_name_set");
|
||||
"rna_AttributeGroupMesh_active_color_name_get",
|
||||
"rna_AttributeGroupMesh_active_color_name_length",
|
||||
"rna_AttributeGroupMesh_active_color_name_set");
|
||||
RNA_def_property_ui_text(prop,
|
||||
"Active Color Attribute",
|
||||
"The name of the active color attribute for display and editing");
|
||||
@ -1462,6 +1587,69 @@ static void rna_def_attribute_group_grease_pencil(BlenderRNA *brna)
|
||||
rna_def_attribute_group_id_common(srna);
|
||||
}
|
||||
|
||||
static void rna_def_attribute_group_grease_pencil_drawing(BlenderRNA *brna)
|
||||
{
|
||||
PropertyRNA *prop;
|
||||
FunctionRNA *func;
|
||||
PropertyRNA *parm;
|
||||
StructRNA *srna;
|
||||
|
||||
srna = RNA_def_struct(brna, "AttributeGroupGreasePencilDrawing", nullptr);
|
||||
RNA_def_struct_ui_text(srna, "Attribute Group", "Group of geometry attributes");
|
||||
RNA_def_struct_sdna(srna, "GreasePencilDrawing");
|
||||
|
||||
/* API */
|
||||
func = RNA_def_function(srna, "new", "rna_AttributeGroupGreasePencilDrawing_new");
|
||||
RNA_def_function_ui_description(func, "Add attribute to geometry");
|
||||
RNA_def_function_flag(func, FUNC_USE_SELF_ID | FUNC_USE_REPORTS);
|
||||
parm = RNA_def_string(func, "name", "Attribute", 0, "Name", "Name of geometry attribute");
|
||||
RNA_def_parameter_flags(parm, PropertyFlag(0), PARM_REQUIRED);
|
||||
|
||||
parm = RNA_def_enum(
|
||||
func, "type", rna_enum_attribute_type_items, CD_PROP_FLOAT, "Type", "Attribute type");
|
||||
RNA_def_parameter_flags(parm, PropertyFlag(0), PARM_REQUIRED);
|
||||
|
||||
parm = RNA_def_enum(func,
|
||||
"domain",
|
||||
rna_enum_attribute_domain_items,
|
||||
int(AttrDomain::Point),
|
||||
"Domain",
|
||||
"Type of element that attribute is stored on");
|
||||
RNA_def_parameter_flags(parm, PropertyFlag(0), PARM_REQUIRED);
|
||||
|
||||
parm = RNA_def_pointer(func, "attribute", "Attribute", "", "New geometry attribute");
|
||||
RNA_def_parameter_flags(parm, PropertyFlag(0), PARM_RNAPTR);
|
||||
RNA_def_function_return(func, parm);
|
||||
|
||||
func = RNA_def_function(srna, "remove", "rna_AttributeGroupGreasePencilDrawing_remove");
|
||||
RNA_def_function_ui_description(func, "Remove attribute from geometry");
|
||||
RNA_def_function_flag(func, FUNC_USE_SELF_ID | FUNC_USE_REPORTS);
|
||||
parm = RNA_def_pointer(func, "attribute", "Attribute", "", "Geometry Attribute");
|
||||
filedescriptor marked this conversation as resolved
Lukas Tönne
commented
Does this need a poll function? I think right now you could call this with an arbitrary drawing from different geometry and it would still try to set the active layer by name. Not a huge issue i guess, but maybe should be handled. Does this need a poll function? I think right now you could call this with an arbitrary drawing from different geometry and it would still try to set the active layer by name. Not a huge issue i guess, but maybe should be handled.
Falk David
commented
Hm not sure I follow. What would the poll function do? Hm not sure I follow. What would the poll function do?
Lukas Tönne
commented
It would check if the attribute layer given as a parameter is actually owned by the drawing, and cancel if not (rather than try and find a layer with the same name). It would check if the attribute layer given as a parameter is actually owned by the drawing, and cancel if not (rather than try and find a layer with the same name).
|
||||
RNA_def_parameter_flags(parm, PROP_NEVER_NULL, PARM_REQUIRED | PARM_RNAPTR);
|
||||
RNA_def_parameter_clear_flags(parm, PROP_THICK_WRAP, ParameterFlag(0));
|
||||
|
||||
/* Active */
|
||||
prop = RNA_def_property(srna, "active", PROP_POINTER, PROP_NONE);
|
||||
RNA_def_property_struct_type(prop, "Attribute");
|
||||
RNA_def_property_ui_text(prop, "Active Attribute", "Active attribute");
|
||||
RNA_def_property_pointer_funcs(prop,
|
||||
"rna_AttributeGroupGreasePencilDrawing_active_get",
|
||||
"rna_AttributeGroupGreasePencilDrawing_active_set",
|
||||
nullptr,
|
||||
"rna_AttributeGroupGreasePencilDrawing_active_poll");
|
||||
RNA_def_property_flag(prop, PROP_EDITABLE | PROP_NEVER_UNLINK);
|
||||
RNA_def_property_update(prop, 0, "rna_AttributeGroup_update_active");
|
||||
filedescriptor marked this conversation as resolved
Outdated
Bastien Montagne
commented
I find it weird to use a function named Would suggest to either rename that one to a generic I find it weird to use a function named `rna_AttributeGroupID_update_active` for non-ID-owned attribute data?
Would suggest to either rename that one to a generic `rna_AttributeGroup_update_active`name, or to add a `rna_AttributeGroupGreasePencilDrawing_update_active` one (which could then call `rna_AttributeGroupID_update_active` if it's fine to do so)?
|
||||
|
||||
prop = RNA_def_property(srna, "active_index", PROP_INT, PROP_NONE);
|
||||
RNA_def_property_ui_text(prop, "Active Attribute Index", "Active attribute index");
|
||||
RNA_def_property_clear_flag(prop, PROP_ANIMATABLE);
|
||||
RNA_def_property_int_funcs(prop,
|
||||
"rna_AttributeGroupGreasePencilDrawing_active_index_get",
|
||||
"rna_AttributeGroupGreasePencilDrawing_active_index_set",
|
||||
"rna_AttributeGroupGreasePencilDrawing_active_index_range");
|
||||
RNA_def_property_update(prop, 0, "rna_AttributeGroup_update_active");
|
||||
}
|
||||
|
||||
void rna_def_attributes_common(StructRNA *srna, const AttributeOwnerType type)
|
||||
{
|
||||
PropertyRNA *prop;
|
||||
@ -1492,6 +1680,9 @@ void rna_def_attributes_common(StructRNA *srna, const AttributeOwnerType type)
|
||||
case AttributeOwnerType::GreasePencil:
|
||||
RNA_def_property_srna(prop, "AttributeGroupGreasePencil");
|
||||
break;
|
||||
case AttributeOwnerType::GreasePencilDrawing:
|
||||
RNA_def_property_srna(prop, "AttributeGroupGreasePencilDrawing");
|
||||
break;
|
||||
}
|
||||
|
||||
prop = RNA_def_property(srna, "color_attributes", PROP_COLLECTION, PROP_NONE);
|
||||
@ -1519,6 +1710,9 @@ void rna_def_attributes_common(StructRNA *srna, const AttributeOwnerType type)
|
||||
case AttributeOwnerType::GreasePencil:
|
||||
RNA_def_property_srna(prop, "AttributeGroupGreasePencil");
|
||||
break;
|
||||
case AttributeOwnerType::GreasePencilDrawing:
|
||||
RNA_def_property_srna(prop, "AttributeGroupGreasePencilDrawing");
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
@ -1529,5 +1723,6 @@ void RNA_def_attribute(BlenderRNA *brna)
|
||||
rna_def_attribute_group_point_cloud(brna);
|
||||
rna_def_attribute_group_curves(brna);
|
||||
rna_def_attribute_group_grease_pencil(brna);
|
||||
rna_def_attribute_group_grease_pencil_drawing(brna);
|
||||
}
|
||||
#endif
|
||||
|
@ -1,4 +1,4 @@
|
||||
/* SPDX-FileCopyrightText: 2023 Blender Authors
|
||||
/* SPDX-FileCopyrightText: 2024 Blender Authors
|
||||
*
|
||||
* SPDX-License-Identifier: GPL-2.0-or-later */
|
||||
|
||||
@ -12,6 +12,7 @@
|
||||
#include "BLI_string.h"
|
||||
|
||||
#include "DNA_grease_pencil_types.h"
|
||||
#include "DNA_scene_types.h"
|
||||
|
||||
#include "RNA_access.hh"
|
||||
#include "RNA_define.hh"
|
||||
@ -21,12 +22,6 @@
|
||||
|
||||
#include "WM_api.hh"
|
||||
|
||||
const EnumPropertyItem rna_enum_tree_node_move_type_items[] = {
|
||||
{-1, "DOWN", 0, "Down", ""},
|
||||
{1, "UP", 0, "Up", ""},
|
||||
{0, nullptr, 0, nullptr, nullptr},
|
||||
};
|
||||
|
||||
#ifdef RNA_RUNTIME
|
||||
|
||||
# include <fmt/format.h>
|
||||
@ -74,6 +69,107 @@ static void rna_grease_pencil_dependency_update(Main *bmain, Scene * /*scene*/,
|
||||
WM_main_add_notifier(NC_GPENCIL | NA_EDITED, rna_grease_pencil(ptr));
|
||||
}
|
||||
|
||||
static int rna_Drawing_user_count_get(PointerRNA *ptr)
|
||||
{
|
||||
using namespace blender::bke::greasepencil;
|
||||
const GreasePencilDrawing *drawing = static_cast<const GreasePencilDrawing *>(ptr->data);
|
||||
return drawing->wrap().user_count();
|
||||
}
|
||||
|
||||
static void rna_GreasePencilLayer_frames_begin(CollectionPropertyIterator *iter, PointerRNA *ptr)
|
||||
{
|
||||
using namespace blender::bke::greasepencil;
|
||||
Layer &layer = static_cast<GreasePencilLayer *>(ptr->data)->wrap();
|
||||
blender::Span<FramesMapKeyT> sorted_keys = layer.sorted_keys();
|
||||
|
||||
rna_iterator_array_begin(
|
||||
iter, (void *)sorted_keys.data(), sizeof(FramesMapKeyT), sorted_keys.size(), false, nullptr);
|
||||
}
|
||||
|
||||
static PointerRNA rna_GreasePencilLayer_frames_get(CollectionPropertyIterator *iter)
|
||||
{
|
||||
using namespace blender::bke::greasepencil;
|
||||
const FramesMapKeyT frame_key = *static_cast<FramesMapKeyT *>(rna_iterator_array_get(iter));
|
||||
const Layer &layer = static_cast<GreasePencilLayer *>(iter->parent.data)->wrap();
|
||||
const GreasePencilFrame *frame = layer.frames().lookup_ptr(frame_key);
|
||||
return rna_pointer_inherit_refine(&iter->parent,
|
||||
&RNA_GreasePencilFrame,
|
||||
static_cast<void *>(const_cast<GreasePencilFrame *>(frame)));
|
||||
}
|
||||
|
||||
static int rna_GreasePencilLayer_frames_length(PointerRNA *ptr)
|
||||
{
|
||||
using namespace blender::bke::greasepencil;
|
||||
Layer &layer = static_cast<GreasePencilLayer *>(ptr->data)->wrap();
|
||||
return layer.frames().size();
|
||||
}
|
||||
|
||||
static bool rna_GreasePencilLayer_frames_lookup_int(PointerRNA *ptr, int index, PointerRNA *r_ptr)
|
||||
{
|
||||
using namespace blender::bke::greasepencil;
|
||||
GreasePencil &grease_pencil = *rna_grease_pencil(ptr);
|
||||
Layer &layer = static_cast<GreasePencilLayer *>(ptr->data)->wrap();
|
||||
if (index < 0 || index >= layer.sorted_keys().size()) {
|
||||
return false;
|
||||
}
|
||||
const FramesMapKeyT frame_key = layer.sorted_keys()[index];
|
||||
const GreasePencilFrame *frame = layer.frames().lookup_ptr(frame_key);
|
||||
|
||||
r_ptr->owner_id = &grease_pencil.id;
|
||||
r_ptr->type = &RNA_GreasePencilFrame;
|
||||
r_ptr->data = static_cast<void *>(const_cast<GreasePencilFrame *>(frame));
|
||||
return true;
|
||||
}
|
||||
|
||||
static std::pair<int, const blender::bke::greasepencil::Layer *> find_layer_of_frame(
|
||||
const GreasePencil &grease_pencil, const GreasePencilFrame &find_frame)
|
||||
{
|
||||
using namespace blender::bke::greasepencil;
|
||||
for (const Layer *layer : grease_pencil.layers()) {
|
||||
for (const auto &[key, frame] : layer->frames().items()) {
|
||||
if (&frame == &find_frame) {
|
||||
return {int(key), layer};
|
||||
}
|
||||
}
|
||||
}
|
||||
return {0, nullptr};
|
||||
}
|
||||
|
||||
static PointerRNA rna_Frame_drawing_get(PointerRNA *ptr)
|
||||
{
|
||||
using namespace blender::bke::greasepencil;
|
||||
const GreasePencil &grease_pencil = *rna_grease_pencil(ptr);
|
||||
GreasePencilFrame &frame_to_find = *static_cast<GreasePencilFrame *>(ptr->data);
|
||||
if (frame_to_find.is_end()) {
|
||||
return PointerRNA_NULL;
|
||||
}
|
||||
|
||||
/* RNA doesn't give access to the parented layer object, so we have to iterate over all layers
|
||||
* and search for the matching GreasePencilFrame pointer in the frames collection. */
|
||||
auto [frame_number, this_layer] = find_layer_of_frame(grease_pencil, frame_to_find);
|
||||
if (this_layer == nullptr) {
|
||||
return PointerRNA_NULL;
|
||||
}
|
||||
|
||||
const Drawing *drawing = grease_pencil.get_drawing_at(*this_layer, frame_number);
|
||||
return rna_pointer_inherit_refine(
|
||||
ptr, &RNA_GreasePencilDrawing, static_cast<void *>(const_cast<Drawing *>(drawing)));
|
||||
}
|
||||
|
||||
static int rna_Frame_frame_number_get(PointerRNA *ptr)
|
||||
{
|
||||
using namespace blender::bke::greasepencil;
|
||||
const GreasePencil &grease_pencil = *rna_grease_pencil(ptr);
|
||||
GreasePencilFrame &frame_to_find = *static_cast<GreasePencilFrame *>(ptr->data);
|
||||
|
||||
/* RNA doesn't give access to the parented layer object, so we have to iterate over all layers
|
||||
* and search for the matching GreasePencilFrame pointer in the frames collection. */
|
||||
auto [frame_number, this_layer] = find_layer_of_frame(grease_pencil, frame_to_find);
|
||||
/* Layer should exist. */
|
||||
BLI_assert(this_layer != nullptr);
|
||||
return frame_number;
|
||||
}
|
||||
|
||||
static void rna_grease_pencil_layer_mask_name_get(PointerRNA *ptr, char *dst)
|
||||
{
|
||||
using namespace blender;
|
||||
@ -254,206 +350,6 @@ static PointerRNA rna_GreasePencilLayer_parent_layer_group_get(PointerRNA *ptr)
|
||||
ptr, &RNA_GreasePencilLayerGroup, static_cast<void *>(layer_group));
|
||||
}
|
||||
|
||||
static PointerRNA rna_GreasePencil_layer_group_new(GreasePencil *grease_pencil,
|
||||
const char *name,
|
||||
PointerRNA *parent_group_ptr)
|
||||
{
|
||||
using namespace blender::bke::greasepencil;
|
||||
LayerGroup *parent_group;
|
||||
if (parent_group_ptr && parent_group_ptr->data) {
|
||||
parent_group = static_cast<LayerGroup *>(parent_group_ptr->data);
|
||||
}
|
||||
else {
|
||||
parent_group = &grease_pencil->root_group();
|
||||
}
|
||||
LayerGroup *new_layer_group = &grease_pencil->add_layer_group(*parent_group, name);
|
||||
|
||||
WM_main_add_notifier(NC_GPENCIL | NA_EDITED, grease_pencil);
|
||||
|
||||
PointerRNA ptr = RNA_pointer_create(
|
||||
&grease_pencil->id, &RNA_GreasePencilLayerGroup, new_layer_group);
|
||||
return ptr;
|
||||
}
|
||||
|
||||
static void rna_GreasePencil_layer_group_remove(GreasePencil *grease_pencil,
|
||||
PointerRNA *layer_group_ptr,
|
||||
bool keep_children)
|
||||
{
|
||||
using namespace blender::bke::greasepencil;
|
||||
LayerGroup &layer_group = *static_cast<LayerGroup *>(layer_group_ptr->data);
|
||||
grease_pencil->remove_group(layer_group, keep_children);
|
||||
|
||||
RNA_POINTER_INVALIDATE(layer_group_ptr);
|
||||
DEG_id_tag_update(&grease_pencil->id, ID_RECALC_GEOMETRY);
|
||||
WM_main_add_notifier(NC_GPENCIL | ND_DATA | NA_SELECTED, grease_pencil);
|
||||
}
|
||||
|
||||
static void rna_GreasePencil_layer_group_move(GreasePencil *grease_pencil,
|
||||
PointerRNA *layer_group_ptr,
|
||||
int direction)
|
||||
{
|
||||
if (direction == 0) {
|
||||
return;
|
||||
}
|
||||
|
||||
blender::bke::greasepencil::TreeNode &layer_group_node =
|
||||
static_cast<blender::bke::greasepencil::LayerGroup *>(layer_group_ptr->data)->as_node();
|
||||
switch (direction) {
|
||||
case -1:
|
||||
grease_pencil->move_node_down(layer_group_node, 1);
|
||||
break;
|
||||
case 1:
|
||||
grease_pencil->move_node_up(layer_group_node, 1);
|
||||
break;
|
||||
}
|
||||
|
||||
DEG_id_tag_update(&grease_pencil->id, ID_RECALC_GEOMETRY);
|
||||
WM_main_add_notifier(NC_GPENCIL | NA_EDITED, grease_pencil);
|
||||
}
|
||||
|
||||
static void rna_GreasePencil_layer_group_move_top(GreasePencil *grease_pencil,
|
||||
PointerRNA *layer_group_ptr)
|
||||
{
|
||||
blender::bke::greasepencil::TreeNode &layer_group_node =
|
||||
static_cast<blender::bke::greasepencil::LayerGroup *>(layer_group_ptr->data)->as_node();
|
||||
grease_pencil->move_node_top(layer_group_node);
|
||||
|
||||
DEG_id_tag_update(&grease_pencil->id, ID_RECALC_GEOMETRY);
|
||||
WM_main_add_notifier(NC_GPENCIL | NA_EDITED, grease_pencil);
|
||||
}
|
||||
|
||||
static void rna_GreasePencil_layer_group_move_bottom(GreasePencil *grease_pencil,
|
||||
PointerRNA *layer_group_ptr)
|
||||
{
|
||||
blender::bke::greasepencil::TreeNode &layer_group_node =
|
||||
static_cast<blender::bke::greasepencil::LayerGroup *>(layer_group_ptr->data)->as_node();
|
||||
grease_pencil->move_node_bottom(layer_group_node);
|
||||
|
||||
DEG_id_tag_update(&grease_pencil->id, ID_RECALC_GEOMETRY);
|
||||
WM_main_add_notifier(NC_GPENCIL | NA_EDITED, grease_pencil);
|
||||
}
|
||||
|
||||
static void rna_GreasePencil_layer_group_move_to_layer_group(GreasePencil *grease_pencil,
|
||||
PointerRNA *layer_group_ptr,
|
||||
PointerRNA *parent_group_ptr)
|
||||
{
|
||||
using namespace blender::bke::greasepencil;
|
||||
TreeNode &layer_group_node = static_cast<LayerGroup *>(layer_group_ptr->data)->as_node();
|
||||
LayerGroup *parent_group;
|
||||
if (parent_group_ptr && parent_group_ptr->data) {
|
||||
parent_group = static_cast<LayerGroup *>(parent_group_ptr->data);
|
||||
}
|
||||
else {
|
||||
parent_group = &grease_pencil->root_group();
|
||||
}
|
||||
grease_pencil->move_node_into(layer_group_node, *parent_group);
|
||||
|
||||
DEG_id_tag_update(&grease_pencil->id, ID_RECALC_GEOMETRY);
|
||||
WM_main_add_notifier(NC_GPENCIL | NA_EDITED, grease_pencil);
|
||||
}
|
||||
|
||||
static GreasePencilLayer *rna_GreasePencil_layer_new(GreasePencil *grease_pencil,
|
||||
const char *name,
|
||||
const bool set_active,
|
||||
PointerRNA *layer_group_ptr)
|
||||
{
|
||||
using namespace blender::bke::greasepencil;
|
||||
LayerGroup *layer_group = nullptr;
|
||||
if (layer_group_ptr && layer_group_ptr->data) {
|
||||
layer_group = static_cast<LayerGroup *>(layer_group_ptr->data);
|
||||
}
|
||||
Layer *layer;
|
||||
if (layer_group) {
|
||||
layer = &grease_pencil->add_layer(*layer_group, name);
|
||||
}
|
||||
else {
|
||||
layer = &grease_pencil->add_layer(name);
|
||||
}
|
||||
if (set_active) {
|
||||
grease_pencil->set_active_layer(layer);
|
||||
}
|
||||
|
||||
WM_main_add_notifier(NC_GPENCIL | NA_EDITED, grease_pencil);
|
||||
|
||||
return layer;
|
||||
}
|
||||
|
||||
static void rna_GreasePencil_layer_remove(GreasePencil *grease_pencil, PointerRNA *layer_ptr)
|
||||
{
|
||||
blender::bke::greasepencil::Layer &layer = *static_cast<blender::bke::greasepencil::Layer *>(
|
||||
layer_ptr->data);
|
||||
grease_pencil->remove_layer(layer);
|
||||
|
||||
RNA_POINTER_INVALIDATE(layer_ptr);
|
||||
DEG_id_tag_update(&grease_pencil->id, ID_RECALC_GEOMETRY);
|
||||
WM_main_add_notifier(NC_GPENCIL | ND_DATA | NA_SELECTED, grease_pencil);
|
||||
}
|
||||
|
||||
static void rna_GreasePencil_layer_move(GreasePencil *grease_pencil,
|
||||
PointerRNA *layer_ptr,
|
||||
const int direction)
|
||||
{
|
||||
if (direction == 0) {
|
||||
return;
|
||||
}
|
||||
|
||||
blender::bke::greasepencil::TreeNode &layer_node =
|
||||
static_cast<blender::bke::greasepencil::Layer *>(layer_ptr->data)->as_node();
|
||||
switch (direction) {
|
||||
case -1:
|
||||
grease_pencil->move_node_down(layer_node, 1);
|
||||
break;
|
||||
case 1:
|
||||
grease_pencil->move_node_up(layer_node, 1);
|
||||
break;
|
||||
}
|
||||
|
||||
DEG_id_tag_update(&grease_pencil->id, ID_RECALC_GEOMETRY);
|
||||
WM_main_add_notifier(NC_GPENCIL | NA_EDITED, grease_pencil);
|
||||
}
|
||||
|
||||
static void rna_GreasePencil_layer_move_top(GreasePencil *grease_pencil, PointerRNA *layer_ptr)
|
||||
{
|
||||
blender::bke::greasepencil::TreeNode &layer_node =
|
||||
static_cast<blender::bke::greasepencil::Layer *>(layer_ptr->data)->as_node();
|
||||
grease_pencil->move_node_top(layer_node);
|
||||
|
||||
DEG_id_tag_update(&grease_pencil->id, ID_RECALC_GEOMETRY);
|
||||
WM_main_add_notifier(NC_GPENCIL | NA_EDITED, grease_pencil);
|
||||
}
|
||||
|
||||
static void rna_GreasePencil_layer_move_bottom(GreasePencil *grease_pencil, PointerRNA *layer_ptr)
|
||||
{
|
||||
blender::bke::greasepencil::TreeNode &layer_node =
|
||||
static_cast<blender::bke::greasepencil::Layer *>(layer_ptr->data)->as_node();
|
||||
grease_pencil->move_node_bottom(layer_node);
|
||||
|
||||
DEG_id_tag_update(&grease_pencil->id, ID_RECALC_GEOMETRY);
|
||||
WM_main_add_notifier(NC_GPENCIL | NA_EDITED, grease_pencil);
|
||||
}
|
||||
|
||||
static void rna_GreasePencil_layer_move_to_layer_group(GreasePencil *grease_pencil,
|
||||
PointerRNA *layer_ptr,
|
||||
PointerRNA *layer_group_ptr)
|
||||
{
|
||||
using namespace blender::bke::greasepencil;
|
||||
TreeNode &layer_node = static_cast<Layer *>(layer_ptr->data)->as_node();
|
||||
LayerGroup *layer_group;
|
||||
if (layer_group_ptr && layer_group_ptr->data) {
|
||||
layer_group = static_cast<LayerGroup *>(layer_group_ptr->data);
|
||||
}
|
||||
else {
|
||||
layer_group = &grease_pencil->root_group();
|
||||
}
|
||||
if (layer_group == nullptr) {
|
||||
return;
|
||||
}
|
||||
grease_pencil->move_node_into(layer_node, *layer_group);
|
||||
|
||||
DEG_id_tag_update(&grease_pencil->id, ID_RECALC_GEOMETRY);
|
||||
WM_main_add_notifier(NC_GPENCIL | NA_EDITED, grease_pencil);
|
||||
}
|
||||
|
||||
static PointerRNA rna_GreasePencil_active_layer_get(PointerRNA *ptr)
|
||||
{
|
||||
GreasePencil *grease_pencil = rna_grease_pencil(ptr);
|
||||
Should probably be moved in the
ID
section above