diff options
author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2010-03-16 21:22:55 +0300 |
---|---|---|
committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2010-03-16 21:22:55 +0300 |
commit | 4a2efe0822876d703ba05cd03153ab3759f6c7ee (patch) | |
tree | 708dcbbb716aae1fdc174e494ae9450c95315e01 /source/blender/makesrna | |
parent | 391526c20e7ba0e818241f4dedb3f40aa51fd47a (diff) |
no need to include the setting names in enum items
(commit 27539 by Campbell from render25 branch)
Diffstat (limited to 'source/blender/makesrna')
-rw-r--r-- | source/blender/makesrna/intern/rna_render.c | 2 | ||||
-rw-r--r-- | source/blender/makesrna/intern/rna_scene.c | 37 |
2 files changed, 16 insertions, 23 deletions
diff --git a/source/blender/makesrna/intern/rna_render.c b/source/blender/makesrna/intern/rna_render.c index c52d60f5d41..b10df075121 100644 --- a/source/blender/makesrna/intern/rna_render.c +++ b/source/blender/makesrna/intern/rna_render.c @@ -364,7 +364,7 @@ static void rna_def_render_pass(BlenderRNA *brna) {SCE_PASS_AO, "AO", 0, "AO", ""}, {SCE_PASS_REFLECT, "REFLECTION", 0, "Reflection", ""}, {SCE_PASS_NORMAL, "NORMAL", 0, "Normal", ""}, - {SCE_PASS_VECTOR, "VECTOR", 0, "Vecotr", ""}, + {SCE_PASS_VECTOR, "VECTOR", 0, "Vector", ""}, {SCE_PASS_REFRACT, "REFRACTION", 0, "Refraction", ""}, {SCE_PASS_INDEXOB, "OBJECT_INDEX", 0, "Object Index", ""}, {SCE_PASS_UV, "UV", 0, "UV", ""}, diff --git a/source/blender/makesrna/intern/rna_scene.c b/source/blender/makesrna/intern/rna_scene.c index f4f05168920..b0bfbc43294 100644 --- a/source/blender/makesrna/intern/rna_scene.c +++ b/source/blender/makesrna/intern/rna_scene.c @@ -1716,22 +1716,15 @@ static void rna_def_scene_render_data(BlenderRNA *brna) static EnumPropertyItem bake_qyad_split_items[] ={ {0, "AUTO", 0, "Automatic", "Split quads to give the least distortion while baking"}, - {1, "FIXED", 0, "Fixed", "Split quads pradictably (0,1,2) (0,2,3)"}, - {2, "FIXED_ALT", 0, "Fixed Alternate", "Split quads pradictably (1,2,3) (1,3,0)"}, - {0, NULL, 0, NULL, NULL}}; - - static EnumPropertyItem bake_aa_items[] ={ - {5, "AA_5", 0, "5", ""}, - {8, "AA_8", 0, "8", ""}, - {11, "AA_11", 0, "11", ""}, - {16, "AA_16", 0, "16", ""}, + {1, "FIXED", 0, "Fixed", "Split quads predictably (0,1,2) (0,2,3)"}, + {2, "FIXED_ALT", 0, "Fixed Alternate", "Split quads predictably (1,2,3) (1,3,0)"}, {0, NULL, 0, NULL, NULL}}; static EnumPropertyItem octree_resolution_items[] = { - {64, "OCTREE_RES_64", 0, "64", ""}, - {128, "OCTREE_RES_128", 0, "128", ""}, - {256, "OCTREE_RES_256", 0, "256", ""}, - {512, "OCTREE_RES_512", 0, "512", ""}, + {64, "64", 0, "64", ""}, + {128, "128", 0, "128", ""}, + {256, "256", 0, "256", ""}, + {512, "512", 0, "512", ""}, {0, NULL, 0, NULL, NULL}}; static EnumPropertyItem raytrace_structure_items[] = { @@ -1745,20 +1738,20 @@ static void rna_def_scene_render_data(BlenderRNA *brna) }; static EnumPropertyItem fixed_oversample_items[] = { - {5, "OVERSAMPLE_5", 0, "5", ""}, - {8, "OVERSAMPLE_8", 0, "8", ""}, - {11, "OVERSAMPLE_11", 0, "11", ""}, - {16, "OVERSAMPLE_16", 0, "16", ""}, + {5, "5", 0, "5", ""}, + {8, "8", 0, "8", ""}, + {11, "11", 0, "11", ""}, + {16, "16", 0, "16", ""}, {0, NULL, 0, NULL, NULL}}; static EnumPropertyItem field_order_items[] = { - {0, "FIELDS_EVENFIRST", 0, "Upper First", "Upper field first"}, - {R_ODDFIELD, "FIELDS_ODDFIRST", 0, "Lower First", "Lower field first"}, + {0, "EVEN_FIRST", 0, "Upper First", "Upper field first"}, + {R_ODDFIELD, "ODD_FIRST", 0, "Lower First", "Lower field first"}, {0, NULL, 0, NULL, NULL}}; static EnumPropertyItem threads_mode_items[] = { - {0, "THREADS_AUTO", 0, "Auto-detect", "Automatically determine the number of threads, based on CPUs"}, - {R_FIXED_THREADS, "THREADS_FIXED", 0, "Fixed", "Manually determine the number of threads"}, + {0, "AUTO", 0, "Auto-detect", "Automatically determine the number of threads, based on CPUs"}, + {R_FIXED_THREADS, "FIXED", 0, "Fixed", "Manually determine the number of threads"}, {0, NULL, 0, NULL, NULL}}; #ifdef WITH_OPENEXR @@ -2389,7 +2382,7 @@ static void rna_def_scene_render_data(BlenderRNA *brna) prop= RNA_def_property(srna, "bake_aa_mode", PROP_ENUM, PROP_NONE); RNA_def_property_enum_bitflag_sdna(prop, NULL, "bake_osa"); - RNA_def_property_enum_items(prop, bake_aa_items); + RNA_def_property_enum_items(prop, fixed_oversample_items); RNA_def_property_ui_text(prop, "Anti-Aliasing Level", ""); prop= RNA_def_property(srna, "bake_active", PROP_BOOLEAN, PROP_NONE); |