diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-06-27 22:29:47 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-06-27 22:29:47 +0400 |
| commit | 32478997ec1fac6b155ffc1442312c4c33fd53df (patch) | |
| tree | e5a2d8cbe02b24d14807ea18cc1ac8f6f26ade43 /source/blender/makesdna | |
| parent | 25a018fad09907acfbd12580e75b3091b4ef7080 (diff) | |
style cleanup
Diffstat (limited to 'source/blender/makesdna')
| -rw-r--r-- | source/blender/makesdna/DNA_anim_types.h | 2 | ||||
| -rw-r--r-- | source/blender/makesdna/DNA_scene_types.h | 2 | ||||
| -rw-r--r-- | source/blender/makesdna/intern/dna_genfile.c | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/makesdna/DNA_anim_types.h b/source/blender/makesdna/DNA_anim_types.h index 55fb3322806..17ee8723e53 100644 --- a/source/blender/makesdna/DNA_anim_types.h +++ b/source/blender/makesdna/DNA_anim_types.h @@ -891,7 +891,7 @@ typedef enum eAnimData_Flag { typedef enum eAnimData_Recalc { ADT_RECALC_DRIVERS = (1<<0), ADT_RECALC_ANIM = (1<<1), - ADT_RECALC_ALL = (ADT_RECALC_DRIVERS|ADT_RECALC_ANIM) + ADT_RECALC_ALL = (ADT_RECALC_DRIVERS | ADT_RECALC_ANIM) } eAnimData_Recalc; /* Base Struct for Anim ------------------------------------- */ diff --git a/source/blender/makesdna/DNA_scene_types.h b/source/blender/makesdna/DNA_scene_types.h index 3bceb0277d5..6a8022c07a5 100644 --- a/source/blender/makesdna/DNA_scene_types.h +++ b/source/blender/makesdna/DNA_scene_types.h @@ -625,7 +625,7 @@ typedef struct GameData { short ticrate, maxlogicstep, physubstep, maxphystep; short obstacleSimulation, pad1; float levelHeight; - float deactivationtime, lineardeactthreshold, angulardeactthreshold,pad2; + float deactivationtime, lineardeactthreshold, angulardeactthreshold, pad2; } GameData; #define STEREO_NOSTEREO 1 diff --git a/source/blender/makesdna/intern/dna_genfile.c b/source/blender/makesdna/intern/dna_genfile.c index 2498cba42ef..8be743335cc 100644 --- a/source/blender/makesdna/intern/dna_genfile.c +++ b/source/blender/makesdna/intern/dna_genfile.c @@ -659,10 +659,10 @@ static eSDNA_Type sdna_type_nr(const char *dna_type) if ((strcmp(dna_type, "char") == 0) || (strcmp(dna_type, "const char") == 0)) return SDNA_TYPE_CHAR; else if ((strcmp(dna_type, "uchar") == 0) || (strcmp(dna_type, "unsigned char") == 0)) return SDNA_TYPE_UCHAR; else if ( strcmp(dna_type, "short") == 0) return SDNA_TYPE_SHORT; - else if ((strcmp(dna_type, "ushort") == 0)||(strcmp(dna_type, "unsigned short") == 0)) return SDNA_TYPE_USHORT; + else if ((strcmp(dna_type, "ushort") == 0) || (strcmp(dna_type, "unsigned short") == 0)) return SDNA_TYPE_USHORT; else if ( strcmp(dna_type, "int") == 0) return SDNA_TYPE_INT; else if ( strcmp(dna_type, "long") == 0) return SDNA_TYPE_LONG; - else if ((strcmp(dna_type, "ulong") == 0)||(strcmp(dna_type, "unsigned long") == 0)) return SDNA_TYPE_ULONG; + else if ((strcmp(dna_type, "ulong") == 0) || (strcmp(dna_type, "unsigned long") == 0)) return SDNA_TYPE_ULONG; else if ( strcmp(dna_type, "float") == 0) return SDNA_TYPE_FLOAT; else if ( strcmp(dna_type, "double") == 0) return SDNA_TYPE_DOUBLE; else if ( strcmp(dna_type, "int64_t") == 0) return SDNA_TYPE_INT64; |