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/makesdna/DNA_property_types.h | |
| 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/makesdna/DNA_property_types.h')
| -rw-r--r-- | source/blender/makesdna/DNA_property_types.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/source/blender/makesdna/DNA_property_types.h b/source/blender/makesdna/DNA_property_types.h index b370c547ce0..7cc365a9ebc 100644 --- a/source/blender/makesdna/DNA_property_types.h +++ b/source/blender/makesdna/DNA_property_types.h @@ -48,13 +48,13 @@ typedef struct bProperty { } bProperty; -/* property->type */ -#define PROP_BOOL 0 -#define PROP_INT 1 -#define PROP_FLOAT 2 -#define PROP_STRING 3 -#define PROP_VECTOR 4 -#define PROP_TIME 5 +/* property->type XXX Game Property, not RNA */ +#define GPROP_BOOL 0 +#define GPROP_INT 1 +#define GPROP_FLOAT 2 +#define GPROP_STRING 3 +#define GPROP_VECTOR 4 +#define GPROP_TIME 5 /* property->flag */ #define PROP_DEBUG 1 |