Merged changes in the trunk up to revision 55357.
[blender.git] / source / blender / makesrna / intern / makesrna.c
index 3cd75ab..0d5c1eb 100644 (file)
@@ -24,7 +24,6 @@
  *  \ingroup RNA
  */
 
-
 #include <float.h>
 #include <limits.h>
 #include <stdio.h>
@@ -34,6 +33,8 @@
 
 #include "MEM_guardedalloc.h"
 
+#include "BLI_utildefines.h"
+
 #include "RNA_access.h"
 #include "RNA_define.h"
 #include "RNA_types.h"
@@ -2450,6 +2451,7 @@ static const char *rna_property_subtypename(PropertySubType type)
                case PROP_ANGLE: return "PROP_ANGLE";
                case PROP_TIME: return "PROP_TIME";
                case PROP_DISTANCE: return "PROP_DISTANCE";
+               case PROP_DISTANCE_CAMERA: return "PROP_DISTANCE_CAMERA";
                case PROP_COLOR: return "PROP_COLOR";
                case PROP_TRANSLATION: return "PROP_TRANSLATION";
                case PROP_DIRECTION: return "PROP_DIRECTION";
@@ -2490,6 +2492,7 @@ static const char *rna_property_subtype_unit(PropertySubType type)
                case PROP_UNIT_TIME:         return "PROP_UNIT_TIME";
                case PROP_UNIT_VELOCITY:     return "PROP_UNIT_VELOCITY";
                case PROP_UNIT_ACCELERATION: return "PROP_UNIT_ACCELERATION";
+               case PROP_UNIT_CAMERA:       return "PROP_UNIT_CAMERA";
                default:                     return "PROP_UNIT_UNKNOWN";
        }
 }
@@ -3172,7 +3175,9 @@ static void rna_generate_struct(BlenderRNA *UNUSED(brna), StructRNA *srna, FILE
 
                fprintf(f, "\t(PropertyRNA *)&rna_%s_%s, ", base->identifier, prop->identifier);
        }
-       else fprintf(f, "\tNULL, ");
+       else {
+               fprintf(f, "\tNULL, ");
+       }
 
        prop = srna->iteratorproperty;
        base = srna;