diff options
| author | Ton Roosendaal <ton@blender.org> | 2008-12-23 22:47:33 +0300 |
|---|---|---|
| committer | Ton Roosendaal <ton@blender.org> | 2008-12-23 22:47:33 +0300 |
| commit | b38f6e7d184c6226de34bde375aa1ce5332c7665 (patch) | |
| tree | ffe165247ef5b9c2621e226a62bdc7478ec37219 /source/blender/makesrna/intern/rna_property.c | |
| parent | 93d9e7749df0a9fd89360ca9347f2fce1ac5dc29 (diff) | |
2.5
Object: converted the old horrible editobject.c, now as file:
editors/object/object_edit.c
Still lots of WIP, I've operatorified "Make Parent". Check here
the new API at work: http://pasteall.org/3650/c
IMPORTANT NOTE FOR BRECHT:
game property defines were clashing with RNA, i've renamed game
defines for now.
Diffstat (limited to 'source/blender/makesrna/intern/rna_property.c')
| -rw-r--r-- | source/blender/makesrna/intern/rna_property.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/source/blender/makesrna/intern/rna_property.c b/source/blender/makesrna/intern/rna_property.c index 9f42d398bb0..3d6fcb6db80 100644 --- a/source/blender/makesrna/intern/rna_property.c +++ b/source/blender/makesrna/intern/rna_property.c @@ -39,15 +39,15 @@ static StructRNA* rna_GameProperty_refine(struct PointerRNA *ptr) bProperty *property= (bProperty*)ptr->data; switch(property->type){ - case PROP_BOOL: + case GPROP_BOOL: return &RNA_GameBooleanProperty; - case PROP_INT: + case GPROP_INT: return &RNA_GameIntProperty; - case PROP_FLOAT: + case GPROP_FLOAT: return &RNA_GameFloatProperty; - case PROP_STRING: + case GPROP_STRING: return &RNA_GameStringProperty; - case PROP_TIME: + case GPROP_TIME: return &RNA_GameTimeProperty; default: return &RNA_GameProperty; @@ -76,11 +76,11 @@ void RNA_def_gameproperty(BlenderRNA *brna) PropertyRNA *prop; static EnumPropertyItem gameproperty_type_items[] ={ - {PROP_BOOL, "BOOL", "Boolean", ""}, - {PROP_INT, "INT", "Integer", ""}, - {PROP_FLOAT, "FLOAT", "Float", ""}, - {PROP_STRING, "STRING", "String", ""}, - {PROP_TIME, "TIME", "Time", ""}, + {GPROP_BOOL, "BOOL", "Boolean", ""}, + {GPROP_INT, "INT", "Integer", ""}, + {GPROP_FLOAT, "FLOAT", "Float", ""}, + {GPROP_STRING, "STRING", "String", ""}, + {GPROP_TIME, "TIME", "Time", ""}, {0, NULL, NULL, NULL}}; /* Base Struct for GameProperty */ |