[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [27560] trunk/blender: no need to include the setting names in enum items
Brecht Van Lommel
brecht at blender.org
Tue Mar 16 19:22:55 CET 2010
Revision: 27560
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=27560
Author: blendix
Date: 2010-03-16 19:22:55 +0100 (Tue, 16 Mar 2010)
Log Message:
-----------
no need to include the setting names in enum items
(commit 27539 by Campbell from render25 branch)
Modified Paths:
--------------
trunk/blender/release/scripts/io/engine_render_pov.py
trunk/blender/release/scripts/io/netrender/ui.py
trunk/blender/release/scripts/ui/properties_render.py
trunk/blender/source/blender/makesrna/intern/rna_render.c
trunk/blender/source/blender/makesrna/intern/rna_scene.c
Modified: trunk/blender/release/scripts/io/engine_render_pov.py
===================================================================
--- trunk/blender/release/scripts/io/engine_render_pov.py 2010-03-16 18:09:27 UTC (rev 27559)
+++ trunk/blender/release/scripts/io/engine_render_pov.py 2010-03-16 18:22:55 UTC (rev 27560)
@@ -630,7 +630,7 @@
file.write('Output_Alpha=1\n')
if render.antialiasing:
- aa_mapping = {'OVERSAMPLE_5': 2, 'OVERSAMPLE_8': 3, 'OVERSAMPLE_11': 4, 'OVERSAMPLE_16': 5} # method 1 assumed
+ aa_mapping = {'5': 2, '8': 3, '11': 4, '16': 5} # method 1 assumed
file.write('Antialias=1\n')
file.write('Antialias_Depth=%d\n' % aa_mapping[render.antialiasing_samples])
else:
Modified: trunk/blender/release/scripts/io/netrender/ui.py
===================================================================
--- trunk/blender/release/scripts/io/netrender/ui.py 2010-03-16 18:09:27 UTC (rev 27559)
+++ trunk/blender/release/scripts/io/netrender/ui.py 2010-03-16 18:22:55 UTC (rev 27560)
@@ -144,7 +144,7 @@
layout.label(text="Threads:")
layout.prop(rd, "threads_mode", expand=True)
sub = layout.column()
- sub.enabled = rd.threads_mode == 'THREADS_FIXED'
+ sub.enabled = rd.threads_mode == 'FIXED'
sub.prop(rd, "threads")
@rnaType
class RENDER_PT_network_master_settings(RenderButtonsPanel):
Modified: trunk/blender/release/scripts/ui/properties_render.py
===================================================================
--- trunk/blender/release/scripts/ui/properties_render.py 2010-03-16 18:09:27 UTC (rev 27559)
+++ trunk/blender/release/scripts/ui/properties_render.py 2010-03-16 18:22:55 UTC (rev 27560)
@@ -218,7 +218,7 @@
col.label(text="Threads:")
col.row().prop(rd, "threads_mode", expand=True)
sub = col.column()
- sub.enabled = rd.threads_mode == 'THREADS_FIXED'
+ sub.enabled = rd.threads_mode == 'FIXED'
sub.prop(rd, "threads")
sub = col.column(align=True)
sub.label(text="Tiles:")
Modified: trunk/blender/source/blender/makesrna/intern/rna_render.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_render.c 2010-03-16 18:09:27 UTC (rev 27559)
+++ trunk/blender/source/blender/makesrna/intern/rna_render.c 2010-03-16 18:22:55 UTC (rev 27560)
@@ -364,7 +364,7 @@
{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", ""},
Modified: trunk/blender/source/blender/makesrna/intern/rna_scene.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_scene.c 2010-03-16 18:09:27 UTC (rev 27559)
+++ trunk/blender/source/blender/makesrna/intern/rna_scene.c 2010-03-16 18:22:55 UTC (rev 27560)
@@ -1716,22 +1716,15 @@
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)"},
+ {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 bake_aa_items[] ={
- {5, "AA_5", 0, "5", ""},
- {8, "AA_8", 0, "8", ""},
- {11, "AA_11", 0, "11", ""},
- {16, "AA_16", 0, "16", ""},
- {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 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 @@
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);
More information about the Bf-blender-cvs
mailing list