[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [42328] trunk/blender: renaming BooleanProperty to BoolProperty ( rna structs shouldnt affect scripters)
Dalai Felinto
dfelinto at gmail.com
Thu Dec 1 23:08:43 CET 2011
Revision: 42328
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=42328
Author: dfelinto
Date: 2011-12-01 22:08:42 +0000 (Thu, 01 Dec 2011)
Log Message:
-----------
renaming BooleanProperty to BoolProperty (rna structs shouldnt affect scripters)
Talked with Brecht and Campbell and they both agreed that bpy.types should match bpy.props
In the ideal world we would rename bpy.props to BooleanProperty. This would break scripts though. So we go for a compromise and at least have some consistency.
Modified Paths:
--------------
trunk/blender/release/scripts/startup/keyingsets_builtins.py
trunk/blender/source/blender/makesrna/RNA_access.h
trunk/blender/source/blender/makesrna/intern/makesrna.c
trunk/blender/source/blender/makesrna/intern/rna_access.c
trunk/blender/source/blender/makesrna/intern/rna_define.c
trunk/blender/source/blender/makesrna/intern/rna_internal_types.h
trunk/blender/source/blender/makesrna/intern/rna_rna.c
trunk/blender/source/blender/python/intern/bpy_rna.c
Modified: trunk/blender/release/scripts/startup/keyingsets_builtins.py
===================================================================
--- trunk/blender/release/scripts/startup/keyingsets_builtins.py 2011-12-01 21:46:10 UTC (rev 42327)
+++ trunk/blender/release/scripts/startup/keyingsets_builtins.py 2011-12-01 22:08:42 UTC (rev 42328)
@@ -354,7 +354,7 @@
# custom properties
def doCustomProps(ksi, ks, bone):
- prop_type_compat = {bpy.types.BooleanProperty,
+ prop_type_compat = {bpy.types.BoolProperty,
bpy.types.IntProperty,
bpy.types.FloatProperty}
Modified: trunk/blender/source/blender/makesrna/RNA_access.h
===================================================================
--- trunk/blender/source/blender/makesrna/RNA_access.h 2011-12-01 21:46:10 UTC (rev 42327)
+++ trunk/blender/source/blender/makesrna/RNA_access.h 2011-12-01 22:08:42 UTC (rev 42328)
@@ -87,7 +87,7 @@
extern StructRNA RNA_Bone;
extern StructRNA RNA_BoneGroup;
extern StructRNA RNA_BooleanModifier;
-extern StructRNA RNA_BooleanProperty;
+extern StructRNA RNA_BoolProperty;
extern StructRNA RNA_Brush;
extern StructRNA RNA_BrushTextureSlot;
extern StructRNA RNA_BuildModifier;
Modified: trunk/blender/source/blender/makesrna/intern/makesrna.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/makesrna.c 2011-12-01 21:46:10 UTC (rev 42327)
+++ trunk/blender/source/blender/makesrna/intern/makesrna.c 2011-12-01 22:08:42 UTC (rev 42328)
@@ -1196,7 +1196,7 @@
switch(prop->type) {
case PROP_BOOLEAN: {
- BooleanPropertyRNA *bprop= (BooleanPropertyRNA*)prop;
+ BoolPropertyRNA *bprop= (BoolPropertyRNA*)prop;
if(!prop->arraydimension) {
if(!bprop->get && !bprop->set && !dp->booleanbit)
@@ -1812,7 +1812,7 @@
static const char *rna_property_structname(PropertyType type)
{
switch(type) {
- case PROP_BOOLEAN: return "BooleanPropertyRNA";
+ case PROP_BOOLEAN: return "BoolPropertyRNA";
case PROP_INT: return "IntPropertyRNA";
case PROP_FLOAT: return "FloatPropertyRNA";
case PROP_STRING: return "StringPropertyRNA";
@@ -2154,7 +2154,7 @@
break;
}
case PROP_BOOLEAN: {
- BooleanPropertyRNA *bprop= (BooleanPropertyRNA*)prop;
+ BoolPropertyRNA *bprop= (BoolPropertyRNA*)prop;
unsigned int i;
if(prop->arraydimension && prop->totarraylength) {
@@ -2243,7 +2243,7 @@
switch(prop->type) {
case PROP_BOOLEAN: {
- BooleanPropertyRNA *bprop= (BooleanPropertyRNA*)prop;
+ BoolPropertyRNA *bprop= (BoolPropertyRNA*)prop;
fprintf(f, "\t%s, %s, %s, %s, %d, ", rna_function_string(bprop->get), rna_function_string(bprop->set), rna_function_string(bprop->getarray), rna_function_string(bprop->setarray), bprop->defaultvalue);
if(prop->arraydimension && prop->totarraylength) fprintf(f, "rna_%s%s_%s_default\n", srna->identifier, strnest, prop->identifier);
else fprintf(f, "NULL\n");
Modified: trunk/blender/source/blender/makesrna/intern/rna_access.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_access.c 2011-12-01 21:46:10 UTC (rev 42327)
+++ trunk/blender/source/blender/makesrna/intern/rna_access.c 2011-12-01 22:08:42 UTC (rev 42328)
@@ -1580,7 +1580,7 @@
int RNA_property_boolean_get(PointerRNA *ptr, PropertyRNA *prop)
{
- BooleanPropertyRNA *bprop= (BooleanPropertyRNA*)prop;
+ BoolPropertyRNA *bprop= (BoolPropertyRNA*)prop;
IDProperty *idprop;
BLI_assert(RNA_property_type(prop) == PROP_BOOLEAN);
@@ -1596,7 +1596,7 @@
void RNA_property_boolean_set(PointerRNA *ptr, PropertyRNA *prop, int value)
{
- BooleanPropertyRNA *bprop= (BooleanPropertyRNA*)prop;
+ BoolPropertyRNA *bprop= (BoolPropertyRNA*)prop;
IDProperty *idprop;
BLI_assert(RNA_property_type(prop) == PROP_BOOLEAN);
@@ -1623,7 +1623,7 @@
void RNA_property_boolean_get_array(PointerRNA *ptr, PropertyRNA *prop, int *values)
{
- BooleanPropertyRNA *bprop= (BooleanPropertyRNA*)prop;
+ BoolPropertyRNA *bprop= (BoolPropertyRNA*)prop;
IDProperty *idprop;
BLI_assert(RNA_property_type(prop) == PROP_BOOLEAN);
@@ -1671,7 +1671,7 @@
void RNA_property_boolean_set_array(PointerRNA *ptr, PropertyRNA *prop, const int *values)
{
- BooleanPropertyRNA *bprop= (BooleanPropertyRNA*)prop;
+ BoolPropertyRNA *bprop= (BoolPropertyRNA*)prop;
IDProperty *idprop;
BLI_assert(RNA_property_type(prop) == PROP_BOOLEAN);
@@ -1729,7 +1729,7 @@
int RNA_property_boolean_get_default(PointerRNA *UNUSED(ptr), PropertyRNA *prop)
{
- BooleanPropertyRNA *bprop= (BooleanPropertyRNA*)prop;
+ BoolPropertyRNA *bprop= (BoolPropertyRNA*)prop;
BLI_assert(RNA_property_type(prop) == PROP_BOOLEAN);
BLI_assert(RNA_property_array_check(prop) == 0);
@@ -1739,7 +1739,7 @@
void RNA_property_boolean_get_default_array(PointerRNA *UNUSED(ptr), PropertyRNA *prop, int *values)
{
- BooleanPropertyRNA *bprop= (BooleanPropertyRNA*)prop;
+ BoolPropertyRNA *bprop= (BoolPropertyRNA*)prop;
BLI_assert(RNA_property_type(prop) == PROP_BOOLEAN);
BLI_assert(RNA_property_array_check(prop) != 0);
@@ -4682,8 +4682,8 @@
if(!(parm->flag & PROP_REQUIRED) && !(parm->flag & PROP_DYNAMIC)) {
switch(parm->type) {
case PROP_BOOLEAN:
- if(parm->arraydimension) memcpy(data, ((BooleanPropertyRNA*)parm)->defaultarray, size);
- else memcpy(data, &((BooleanPropertyRNA*)parm)->defaultvalue, size);
+ if(parm->arraydimension) memcpy(data, ((BoolPropertyRNA*)parm)->defaultarray, size);
+ else memcpy(data, &((BoolPropertyRNA*)parm)->defaultvalue, size);
break;
case PROP_INT:
if(parm->arraydimension) memcpy(data, ((IntPropertyRNA*)parm)->defaultarray, size);
Modified: trunk/blender/source/blender/makesrna/intern/rna_define.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_define.c 2011-12-01 21:46:10 UTC (rev 42327)
+++ trunk/blender/source/blender/makesrna/intern/rna_define.c 2011-12-01 22:08:42 UTC (rev 42328)
@@ -580,7 +580,7 @@
static size_t rna_property_type_sizeof(PropertyType type)
{
switch(type) {
- case PROP_BOOLEAN: return sizeof(BooleanPropertyRNA);
+ case PROP_BOOLEAN: return sizeof(BoolPropertyRNA);
case PROP_INT: return sizeof(IntPropertyRNA);
case PROP_FLOAT: return sizeof(FloatPropertyRNA);
case PROP_STRING: return sizeof(StringPropertyRNA);
@@ -1308,7 +1308,7 @@
switch(prop->type) {
case PROP_BOOLEAN: {
- BooleanPropertyRNA *bprop= (BooleanPropertyRNA*)prop;
+ BoolPropertyRNA *bprop= (BoolPropertyRNA*)prop;
bprop->defaultvalue= value;
break;
}
@@ -1325,7 +1325,7 @@
switch(prop->type) {
case PROP_BOOLEAN: {
- BooleanPropertyRNA *bprop= (BooleanPropertyRNA*)prop;
+ BoolPropertyRNA *bprop= (BoolPropertyRNA*)prop;
bprop->defaultarray= array;
break;
}
@@ -1889,7 +1889,7 @@
switch(prop->type) {
case PROP_BOOLEAN: {
- BooleanPropertyRNA *bprop= (BooleanPropertyRNA*)prop;
+ BoolPropertyRNA *bprop= (BoolPropertyRNA*)prop;
if(prop->arraydimension) {
if(get) bprop->getarray= (PropBooleanArrayGetFunc)get;
@@ -2806,7 +2806,7 @@
switch(prop->type) {
case PROP_BOOLEAN: {
- BooleanPropertyRNA *bprop= (BooleanPropertyRNA*)prop;
+ BoolPropertyRNA *bprop= (BoolPropertyRNA*)prop;
if(bprop->defaultarray) {
iarray= MEM_callocN(sizeof(int)*prop->totarraylength, "RNA_def_property_store");
@@ -2875,7 +2875,7 @@
switch(prop->type) {
case PROP_BOOLEAN: {
- BooleanPropertyRNA *bprop= (BooleanPropertyRNA*)prop;
+ BoolPropertyRNA *bprop= (BoolPropertyRNA*)prop;
if(bprop->defaultarray) MEM_freeN((void*)bprop->defaultarray);
break;
}
Modified: trunk/blender/source/blender/makesrna/intern/rna_internal_types.h
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_internal_types.h 2011-12-01 21:46:10 UTC (rev 42327)
+++ trunk/blender/source/blender/makesrna/intern/rna_internal_types.h 2011-12-01 22:08:42 UTC (rev 42328)
@@ -185,7 +185,7 @@
/* Property Types */
-typedef struct BooleanPropertyRNA {
+typedef struct BoolPropertyRNA {
PropertyRNA property;
PropBooleanGetFunc get;
@@ -196,7 +196,7 @@
int defaultvalue;
const int *defaultarray;
-} BooleanPropertyRNA;
+} BoolPropertyRNA;
typedef struct IntPropertyRNA {
PropertyRNA property;
Modified: trunk/blender/source/blender/makesrna/intern/rna_rna.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_rna.c 2011-12-01 21:46:10 UTC (rev 42327)
+++ trunk/blender/source/blender/makesrna/intern/rna_rna.c 2011-12-01 22:08:42 UTC (rev 42328)
@@ -413,7 +413,7 @@
rna_idproperty_check(&prop, ptr); /* XXX ptr? */
switch(prop->type) {
- case PROP_BOOLEAN: return &RNA_BooleanProperty;
+ case PROP_BOOLEAN: return &RNA_BoolProperty;
case PROP_INT: return &RNA_IntProperty;
case PROP_FLOAT: return &RNA_FloatProperty;
case PROP_STRING: return &RNA_StringProperty;
@@ -578,7 +578,7 @@
{
PropertyRNA *prop= (PropertyRNA*)ptr->data;
rna_idproperty_check(&prop, ptr);
- return ((BooleanPropertyRNA*)prop)->defaultvalue;
+ return ((BoolPropertyRNA*)prop)->defaultvalue;
}
static int rna_IntProperty_default_get(PointerRNA *ptr)
@@ -615,7 +615,7 @@
static void rna_BoolProperty_default_array_get(PointerRNA *ptr, int *values)
{
PropertyRNA *prop= (PropertyRNA*)ptr->data;
- BooleanPropertyRNA *nprop= (BooleanPropertyRNA*)prop;
+ BoolPropertyRNA *nprop= (BoolPropertyRNA*)prop;
rna_idproperty_check(&prop, ptr);
if(nprop->defaultarray) {
@@ -1355,8 +1355,8 @@
/* Property */
rna_def_property(brna);
- /* BooleanProperty */
- srna= RNA_def_struct(brna, "BooleanProperty", "Property");
+ /* BoolProperty */
+ srna= RNA_def_struct(brna, "BoolProperty", "Property");
RNA_def_struct_ui_text(srna, "Boolean Definition", "RNA boolean property definition");
rna_def_number_property(srna, PROP_BOOLEAN);
Modified: trunk/blender/source/blender/python/intern/bpy_rna.c
===================================================================
--- trunk/blender/source/blender/python/intern/bpy_rna.c 2011-12-01 21:46:10 UTC (rev 42327)
+++ trunk/blender/source/blender/python/intern/bpy_rna.c 2011-12-01 22:08:42 UTC (rev 42328)
@@ -3495,7 +3495,7 @@
/* Allows:
* >>> bpy.types.Scene.foo= BoolProperty()
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list