Merge with trunk r39750
[blender.git] / source / blender / makesrna / intern / rna_object_force.c
index 61ebe216b53022f56c594cbaf000a1d1e863bf49..39c08e0385a1af0cd620a126ad500ef984a41149 100644 (file)
@@ -43,7 +43,7 @@
 #include "WM_api.h"
 #include "WM_types.h"
 
-EnumPropertyItem effector_shape_items[] = {
+static EnumPropertyItem effector_shape_items[] = {
        {PFIELD_SHAPE_POINT, "POINT", 0, "Point", ""},
        {PFIELD_SHAPE_PLANE, "PLANE", 0, "Plane", ""},
        {PFIELD_SHAPE_SURFACE, "SURFACE", 0, "Surface", ""},
@@ -51,20 +51,23 @@ EnumPropertyItem effector_shape_items[] = {
        {0, NULL, 0, NULL, NULL}
 };
 
-EnumPropertyItem curve_shape_items[] = {
+#ifdef RNA_RUNTIME
+
+/* type spesific return values only used from functions */
+static EnumPropertyItem curve_shape_items[] = {
        {PFIELD_SHAPE_POINT, "POINT", 0, "Point", ""},
        {PFIELD_SHAPE_PLANE, "PLANE", 0, "Plane", ""},
        {PFIELD_SHAPE_SURFACE, "SURFACE", 0, "Curve", ""},
        {0, NULL, 0, NULL, NULL}
 };
 
-EnumPropertyItem empty_shape_items[] = {
+static EnumPropertyItem empty_shape_items[] = {
        {PFIELD_SHAPE_POINT, "POINT", 0, "Point", ""},
        {PFIELD_SHAPE_PLANE, "PLANE", 0, "Plane", ""},
        {0, NULL, 0, NULL, NULL}
 };
 
-EnumPropertyItem vortex_shape_items[] = {
+static EnumPropertyItem vortex_shape_items[] = {
        {PFIELD_SHAPE_POINT, "POINT", 0, "Point", ""},
        {PFIELD_SHAPE_PLANE, "PLANE", 0, "Plane", ""},
        {PFIELD_SHAPE_SURFACE, "SURFACE", 0, "Surface falloff (New)", ""},
@@ -72,21 +75,19 @@ EnumPropertyItem vortex_shape_items[] = {
        {0, NULL, 0, NULL, NULL}
 };
 
-EnumPropertyItem curve_vortex_shape_items[] = {
+static EnumPropertyItem curve_vortex_shape_items[] = {
        {PFIELD_SHAPE_POINT, "POINT", 0, "Point", ""},
        {PFIELD_SHAPE_PLANE, "PLANE", 0, "Plane", ""},
        {PFIELD_SHAPE_SURFACE, "SURFACE", 0, "Curve (New)", ""},
        {0, NULL, 0, NULL, NULL}
 };
 
-EnumPropertyItem empty_vortex_shape_items[] = {
+static EnumPropertyItem empty_vortex_shape_items[] = {
        {PFIELD_SHAPE_POINT, "POINT", 0, "Point", ""},
        {PFIELD_SHAPE_PLANE, "PLANE", 0, "Plane", ""},
        {0, NULL, 0, NULL, NULL}
 };
 
-#ifdef RNA_RUNTIME
-
 #include "MEM_guardedalloc.h"
 
 #include "DNA_modifier_types.h"