Fix for some enum property identifiers, that were not using upper case
authorBrecht Van Lommel <brechtvanlommel@pandora.be>
Mon, 1 Nov 2010 21:45:38 +0000 (21:45 +0000)
committerBrecht Van Lommel <brechtvanlommel@pandora.be>
Mon, 1 Nov 2010 21:45:38 +0000 (21:45 +0000)
with underscore, or were simply not set correctly after code copy/paste.

source/blender/makesrna/intern/rna_actuator.c
source/blender/makesrna/intern/rna_material.c
source/blender/makesrna/intern/rna_sensor.c
source/blender/makesrna/intern/rna_texture.c

index a4becb87e28b3eef5edb512cfec63c78c587c388..49df68d6681541666bba942fabc48ce280954661 100644 (file)
@@ -41,7 +41,7 @@ EnumPropertyItem actuator_type_items[] ={
        {ACT_CAMERA, "CAMERA", 0, "Camera", ""},
        {ACT_CONSTRAINT, "CONSTRAINT", 0, "Constraint", ""},
        {ACT_EDIT_OBJECT, "EDIT_OBJECT", 0, "Edit Object", ""},
-       {ACT_IPO, "F-Curve", 0, "F-Curve", ""},
+       {ACT_IPO, "FCURVE", 0, "F-Curve", ""},
        {ACT_2DFILTER, "FILTER_2D", 0, "Filter 2D", ""},
        {ACT_GAME, "GAME", 0, "Game", ""},
        {ACT_MESSAGE, "MESSAGE", 0, "Message", ""},
@@ -1384,16 +1384,16 @@ static void rna_def_random_actuator(BlenderRNA *brna)
        PropertyRNA *prop;
 
        static EnumPropertyItem prop_distribution_items[] ={
-               {ACT_RANDOM_BOOL_CONST, "RESTART", 0, "Bool Constant", ""},
-               {ACT_RANDOM_BOOL_UNIFORM, "SET", 0, "Bool Uniform", ""},
-               {ACT_RANDOM_BOOL_BERNOUILLI, "CAMERA", 0, "Bool Bernoulli", ""},
-               {ACT_RANDOM_INT_CONST, "ADDFRONT", 0, "Int Constant", ""},
-               {ACT_RANDOM_INT_UNIFORM, "ADDBACK", 0, "Int Uniform", ""},
-               {ACT_RANDOM_INT_POISSON, "REMOVE", 0, "Int Poisson", ""},
-               {ACT_RANDOM_FLOAT_CONST, "SUSPEND", 0, "Float Constant", ""},
-               {ACT_RANDOM_FLOAT_UNIFORM, "RESUME", 0, "Float Uniform", ""},
-               {ACT_RANDOM_FLOAT_NORMAL, "RESUME", 0, "Float Normal", ""},
-               {ACT_RANDOM_FLOAT_NEGATIVE_EXPONENTIAL, "RESUME", 0, "Float Neg. Exp.", ""},
+               {ACT_RANDOM_BOOL_CONST, "BOOL_CONSTANT", 0, "Bool Constant", ""},
+               {ACT_RANDOM_BOOL_UNIFORM, "BOOL_UNIFORM", 0, "Bool Uniform", ""},
+               {ACT_RANDOM_BOOL_BERNOUILLI, "BOOL_BERNOUILLI", 0, "Bool Bernouilli", ""},
+               {ACT_RANDOM_INT_CONST, "INT_CONSTANT", 0, "Int Constant", ""},
+               {ACT_RANDOM_INT_UNIFORM, "INT_UNIFORM", 0, "Int Uniform", ""},
+               {ACT_RANDOM_INT_POISSON, "INT_POISSON", 0, "Int Poisson", ""},
+               {ACT_RANDOM_FLOAT_CONST, "FLOAT_CONSTANT", 0, "Float Constant", ""},
+               {ACT_RANDOM_FLOAT_UNIFORM, "FLOAT_UNIFORM", 0, "Float Uniform", ""},
+               {ACT_RANDOM_FLOAT_NORMAL, "FLOAT_NORMAL", 0, "Float Normal", ""},
+               {ACT_RANDOM_FLOAT_NEGATIVE_EXPONENTIAL, "FLOAT_NEGATIVE_EXPONENTIAL", 0, "Float Neg. Exp.", ""},
                {0, NULL, 0, NULL, NULL}};      
 
        srna= RNA_def_struct(brna, "RandomActuator", "Actuator");
index bf4a958eeb4d9337ea429a99f3dc81b074ff9c7e..8557f115737115cc2f79bd75c8cb0b8aea3f92ee 100644 (file)
@@ -695,8 +695,8 @@ static void rna_def_material_colors(StructRNA *srna)
                {MA_RAMP_SAT, "SATURATION", 0, "Saturation", ""},
                {MA_RAMP_VAL, "VALUE", 0, "Value", ""},
                {MA_RAMP_COLOR, "COLOR", 0, "Color", ""},
-               {MA_RAMP_SOFT, "SOFT LIGHT", 0, "Soft Light", ""}, 
-               {MA_RAMP_LINEAR, "LINEAR LIGHT", 0, "Linear Light", ""}, 
+               {MA_RAMP_SOFT, "SOFT_LIGHT", 0, "Soft Light", ""}, 
+               {MA_RAMP_LINEAR, "LINEAR_LIGHT", 0, "Linear Light", ""}, 
                {0, NULL, 0, NULL, NULL}};
 
        static EnumPropertyItem prop_ramp_input_items[] = {
index 6dddb0425335ea8cbad93066c225616d6435c38e..a1e25207f1f9137ff8162bd12ff5b9758d72825b 100644 (file)
@@ -491,7 +491,7 @@ static void rna_def_armature_sensor(BlenderRNA *brna)
                {SENS_ARM_LIN_ERROR_BELOW, "LINERRORBELOW", 0, "Lin error below", ""},
                {SENS_ARM_LIN_ERROR_ABOVE, "LINERRORABOVE", 0, "Lin error above", ""},
                {SENS_ARM_ROT_ERROR_BELOW, "ROTERRORBELOW", 0, "Rot error below", ""},
-               {SENS_ARM_ROT_ERROR_ABOVE, "ROTERRORBELOW", 0, "Rot error above", ""},
+               {SENS_ARM_ROT_ERROR_ABOVE, "ROTERRORABOVE", 0, "Rot error above", ""},
                {0, NULL, 0, NULL, NULL}};
 
        srna= RNA_def_struct(brna, "ArmatureSensor", "Sensor");
index 567166fd15f4cefcc35a6952dcc8db89bdc92d93..4b5b450a6205dff1f6d46a67e2624bb497f854ad 100644 (file)
@@ -429,8 +429,8 @@ static void rna_def_mtex(BlenderRNA *brna)
                {MTEX_BLEND_SAT, "SATURATION", 0, "Saturation", ""},
                {MTEX_BLEND_VAL, "VALUE", 0, "Value", ""},
                {MTEX_BLEND_COLOR, "COLOR", 0, "Color", ""},
-               {MTEX_SOFT_LIGHT, "SOFT LIGHT", 0, "Soft Light", ""}, 
-               {MTEX_LIN_LIGHT    , "LINEAR LIGHT", 0, "Linear Light", ""}, 
+               {MTEX_SOFT_LIGHT, "SOFT_LIGHT", 0, "Soft Light", ""}, 
+               {MTEX_LIN_LIGHT    , "LINEAR_LIGHT", 0, "Linear Light", ""}, 
                {0, NULL, 0, NULL, NULL}};
 
        static EnumPropertyItem output_node_items[] = {