blender
/
blender
136
406
Fork 589
Code Issues 6.3k Pull Requests 766 Projects 19 Wiki Activity

RNA: support compiling rna files as C++ code #108290

Merged
Jacques Lucke merged 29 commits from JacquesLucke/blender:rna-cpp into main 2023-06-09 11:45:46 +02:00
Conversation 11 Commits 29 Files Changed 8 +31 -27
4 changed files with 31 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 4a6001f3e2 - Show all commits

1
source/blender/makesrna/RNA_types.h
View File

@ -308,6 +308,7 @@ typedef enum PropertyFlag {
**/
PROP_PATH_OUTPUT = (1 << 2),
} PropertyFlag;
ENUM_OPERATORS(PropertyFlag, PROP_NO_DEG_UPDATE)
/**
* Flags related to comparing and overriding RNA properties.

2
source/blender/makesrna/intern/CMakeLists.txt
View File

@ -46,7 +46,7 @@ set(DEFSRC
rna_lightprobe.c
rna_linestyle.c
rna_main.c
rna_mask.c
rna_mask.cc
rna_material.c
rna_mesh.c
rna_meta.cc

6
source/blender/makesrna/intern/makesrna.c
View File

@ -4194,7 +4194,7 @@ static void rna_generate_property(FILE *f, StructRNA *srna, const char *nest, Pr
rna_function_string(iprop->getarray_ex),
rna_function_string(iprop->setarray_ex),
rna_function_string(iprop->range_ex));
rna_int_print(f, iprop->ui_scale_type);
fprintf(f, "%s", rna_ui_scale_type_string(iprop->ui_scale_type));
fprintf(f, ", ");
rna_int_print(f, iprop->softmin);
fprintf(f, ", ");
@ -4256,7 +4256,7 @@ static void rna_generate_property(FILE *f, StructRNA *srna, const char *nest, Pr
case PROP_STRING: {
StringPropertyRNA *sprop = (StringPropertyRNA *)prop;
fprintf(f,
"\t%s, %s, %s, %s, %s, %s, %s, %d, %d, ",
"\t%s, %s, %s, %s, %s, %s, %s, (eStringPropertySearchFlag)%d, %d, ",
rna_function_string(sprop->get),
rna_function_string(sprop->length),
rna_function_string(sprop->set),
@ -4626,7 +4626,7 @@ static RNAProcessItem PROCESS_ITEMS[] = {
{"rna_world.c", NULL, RNA_def_world},
{"rna_movieclip.c", NULL, RNA_def_movieclip},
{"rna_tracking.c", NULL, RNA_def_tracking},
{"rna_mask.c", NULL, RNA_def_mask},
{"rna_mask.cc", NULL, RNA_def_mask},
{"rna_xr.c", NULL, RNA_def_xr},
{NULL, NULL},
};

49
source/blender/makesrna/intern/rna_mask.c → source/blender/makesrna/intern/rna_mask.cc
View File

@ -43,7 +43,7 @@
# include "WM_api.h"
static void rna_Mask_update_data(Main *UNUSED(bmain), Scene *UNUSED(scene), PointerRNA *ptr)
static void rna_Mask_update_data(Main * /*bmain*/, Scene * /*scene*/, PointerRNA *ptr)
{
Mask *mask = (Mask *)ptr->owner_id;
@ -53,7 +53,7 @@ static void rna_Mask_update_data(Main *UNUSED(bmain), Scene *UNUSED(scene), Poin
static void rna_Mask_update_parent(Main *bmain, Scene *scene, PointerRNA *ptr)
{
MaskParent *parent = ptr->data;
MaskParent *parent = static_cast<MaskParent *>(ptr->data);
if (parent->id) {
if (GS(parent->id->name) == ID_MC) {
@ -106,11 +106,11 @@ static void rna_Mask_update_parent(Main *bmain, Scene *scene, PointerRNA *ptr)
/* NOTE: this function exists only to avoid id reference-counting. */
static void rna_MaskParent_id_set(PointerRNA *ptr,
PointerRNA value,
struct ReportList *UNUSED(reports))
struct ReportList * /*reports*/)
{
MaskParent *mpar = (MaskParent *)ptr->data;
mpar->id = value.data;
mpar->id = static_cast<ID *>(value.data);
}
static StructRNA *rna_MaskParent_id_typef(PointerRNA *ptr)
@ -184,7 +184,7 @@ static PointerRNA rna_Mask_layer_active_get(PointerRNA *ptr)
static void rna_Mask_layer_active_set(PointerRNA *ptr,
PointerRNA value,
struct ReportList *UNUSED(reports))
struct ReportList * /*reports*/)
{
Mask *mask = (Mask *)ptr->owner_id;
MaskLayer *masklay = (MaskLayer *)value.data;
@ -221,7 +221,7 @@ static PointerRNA rna_MaskLayer_active_spline_get(PointerRNA *ptr)
static void rna_MaskLayer_active_spline_set(PointerRNA *ptr,
PointerRNA value,
struct ReportList *UNUSED(reports))
struct ReportList * /*reports*/)
{
MaskLayer *masklay = (MaskLayer *)ptr->data;
MaskSpline *spline = (MaskSpline *)value.data;
@ -244,7 +244,7 @@ static PointerRNA rna_MaskLayer_active_spline_point_get(PointerRNA *ptr)
static void rna_MaskLayer_active_spline_point_set(PointerRNA *ptr,
PointerRNA value,
struct ReportList *UNUSED(reports))
struct ReportList * /*reports*/)
{
MaskLayer *masklay = (MaskLayer *)ptr->data;
MaskSpline *spline;
@ -252,7 +252,7 @@ static void rna_MaskLayer_active_spline_point_set(PointerRNA *ptr,
masklay->act_point = NULL;
for (spline = masklay->splines.first; spline; spline = spline->next) {
for (spline = static_cast<MaskSpline *>(masklay->splines.first); spline; spline = spline->next) {
if (point >= spline->points && point < spline->points + spline->tot_point) {
masklay->act_point = point;
@ -314,9 +314,12 @@ static int rna_MaskSplinePoint_handle_type_get(PointerRNA *ptr)
static MaskSpline *mask_spline_from_point(Mask *mask, MaskSplinePoint *point)
{
MaskLayer *mask_layer;
for (mask_layer = mask->masklayers.first; mask_layer; mask_layer = mask_layer->next) {
for (mask_layer = static_cast<MaskLayer *>(mask->masklayers.first); mask_layer;
mask_layer = mask_layer->next)
{
MaskSpline *spline;
for (spline = mask_layer->splines.first; spline; spline = spline->next) {
for (spline = static_cast<MaskSpline *>(mask_layer->splines.first); spline;
spline = spline->next) {
if (point >= spline->points && point < spline->points + spline->tot_point) {
return spline;
}
@ -397,7 +400,7 @@ static MaskLayer *rna_Mask_layers_new(Mask *mask, const char *name)
static void rna_Mask_layers_remove(Mask *mask, ReportList *reports, PointerRNA *masklay_ptr)
{
MaskLayer *masklay = masklay_ptr->data;
MaskLayer *masklay = static_cast<MaskLayer *>(masklay_ptr->data);
if (BLI_findindex(&mask->masklayers, masklay) == -1) {
BKE_reportf(reports,
RPT_ERROR,
@ -438,7 +441,7 @@ static void rna_MaskLayer_spline_remove(ID *id,
PointerRNA *spline_ptr)
{
Mask *mask = (Mask *)id;
MaskSpline *spline = spline_ptr->data;
MaskSpline *spline = static_cast<MaskSpline *>(spline_ptr->data);
if (BKE_mask_spline_remove(mask_layer, spline) == false) {
BKE_reportf(
@ -485,7 +488,7 @@ static void rna_MaskSpline_points_add(ID *id, MaskSpline *spline, int count)
return;
}
for (layer = mask->masklayers.first; layer; layer = layer->next) {
for (layer = static_cast<MaskLayer *>(mask->masklayers.first); layer; layer = layer->next) {
if (BLI_findindex(&layer->splines, spline) != -1) {
break;
}
@ -501,8 +504,8 @@ static void rna_MaskSpline_points_add(ID *id, MaskSpline *spline, int count)
active_point_index = layer->act_point - spline->points;
}
spline->points = MEM_recallocN(spline->points,
sizeof(MaskSplinePoint) * (spline->tot_point + count));
spline->points = static_cast<MaskSplinePoint *>(
MEM_recallocN(spline->points, sizeof(MaskSplinePoint) * (spline->tot_point + count)));
spline->tot_point += count;
if (active_point_index >= 0) {
@ -532,13 +535,13 @@ static void rna_MaskSpline_point_remove(ID *id,
PointerRNA *point_ptr)
{
Mask *mask = (Mask *)id;
MaskSplinePoint *point = point_ptr->data;
MaskSplinePoint *point = static_cast<MaskSplinePoint *>(point_ptr->data);
MaskSplinePoint *new_point_array;
MaskLayer *layer;
int active_point_index = -1;
int point_index;
for (layer = mask->masklayers.first; layer; layer = layer->next) {
for (layer = static_cast<MaskLayer *>(mask->masklayers.first); layer; layer = layer->next) {
if (BLI_findindex(&layer->splines, spline) != -1) {
break;
}
@ -561,8 +564,8 @@ static void rna_MaskSpline_point_remove(ID *id,
point_index = point - spline->points;
new_point_array = MEM_mallocN(sizeof(MaskSplinePoint) * (spline->tot_point - 1),
"remove mask point");
new_point_array = static_cast<MaskSplinePoint *>(
MEM_mallocN(sizeof(MaskSplinePoint) * (spline->tot_point - 1), "remove mask point"));
memcpy(new_point_array, spline->points, sizeof(MaskSplinePoint) * point_index);
memcpy(new_point_array + point_index,
@ -807,7 +810,7 @@ static void rna_def_mask_splines(BlenderRNA *brna)
RNA_def_function_flag(func, FUNC_USE_REPORTS);
parm = RNA_def_pointer(func, "spline", "MaskSpline", "", "The spline to remove");
RNA_def_parameter_flags(parm, PROP_NEVER_NULL, PARM_REQUIRED | PARM_RNAPTR);
RNA_def_parameter_clear_flags(parm, PROP_THICK_WRAP, 0);
RNA_def_parameter_clear_flags(parm, PROP_THICK_WRAP, ParameterFlag(0));
/* active spline */
prop = RNA_def_property(srna, "active", PROP_POINTER, PROP_NONE);
@ -845,7 +848,7 @@ static void rna_def_maskSplinePoints(BlenderRNA *brna)
RNA_def_function_ui_description(func, "Add a number of point to this spline");
parm = RNA_def_int(
func, "count", 1, 0, INT_MAX, "Number", "Number of points to add to the spline", 0, INT_MAX);
RNA_def_parameter_flags(parm, 0, PARM_REQUIRED);
RNA_def_parameter_flags(parm, PropertyFlag(0), PARM_REQUIRED);
/* Remove the point */
func = RNA_def_function(srna, "remove", "rna_MaskSpline_point_remove");
@ -854,7 +857,7 @@ static void rna_def_maskSplinePoints(BlenderRNA *brna)
RNA_def_function_flag(func, FUNC_USE_REPORTS);
parm = RNA_def_pointer(func, "point", "MaskSplinePoint", "", "The point to remove");
RNA_def_parameter_flags(parm, PROP_NEVER_NULL, PARM_REQUIRED | PARM_RNAPTR);
RNA_def_parameter_clear_flags(parm, PROP_THICK_WRAP, 0);
RNA_def_parameter_clear_flags(parm, PROP_THICK_WRAP, ParameterFlag(0));
}
static void rna_def_maskSpline(BlenderRNA *brna)
@ -1068,7 +1071,7 @@ static void rna_def_masklayers(BlenderRNA *brna, PropertyRNA *cprop)
RNA_def_function_ui_description(func, "Remove layer from this mask");
parm = RNA_def_pointer(func, "layer", "MaskLayer", "", "Shape to be removed");
RNA_def_parameter_flags(parm, PROP_NEVER_NULL, PARM_REQUIRED | PARM_RNAPTR);
RNA_def_parameter_clear_flags(parm, PROP_THICK_WRAP, 0);
RNA_def_parameter_clear_flags(parm, PROP_THICK_WRAP, ParameterFlag(0));
/* clear all layers */
func = RNA_def_function(srna, "clear", "rna_Mask_layers_clear");