diff options
| author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2012-09-30 17:16:55 +0400 |
|---|---|---|
| committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2012-09-30 17:16:55 +0400 |
| commit | e91f33101ff0999e07f7ce941f31dca793d954e7 (patch) | |
| tree | 83c0d933f2ac1d063e2c57aaded58fd09d8d5712 /source/blender/makesrna/intern/rna_color.c | |
| parent | a42ba82f638e481d7fd3c3ed2ba05c331ef6717e (diff) | |
| parent | 818b2e81da7d5f3e04439e3b4fef5c7ce5263b5b (diff) | |
Merged changes in the trunk up to revision 50956.
Conflicts resolved:
source/blender/editors/interface/resources.c
Diffstat (limited to 'source/blender/makesrna/intern/rna_color.c')
| -rw-r--r-- | source/blender/makesrna/intern/rna_color.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/makesrna/intern/rna_color.c b/source/blender/makesrna/intern/rna_color.c index bf8b687139b..4d33dc2f1e9 100644 --- a/source/blender/makesrna/intern/rna_color.c +++ b/source/blender/makesrna/intern/rna_color.c @@ -896,7 +896,7 @@ static void rna_def_colormanage(BlenderRNA *brna) srna = RNA_def_struct(brna, "ColorManagedDisplaySettings", NULL); RNA_def_struct_ui_text(srna, "ColorManagedDisplaySettings", "Color management specific to display device"); - prop= RNA_def_property(srna, "display_device", PROP_ENUM, PROP_NONE); + prop = RNA_def_property(srna, "display_device", PROP_ENUM, PROP_NONE); RNA_def_property_enum_items(prop, display_device_items); RNA_def_property_enum_funcs(prop, "rna_ColorManagedDisplaySettings_display_device_get", "rna_ColorManagedDisplaySettings_display_device_set", @@ -908,7 +908,7 @@ static void rna_def_colormanage(BlenderRNA *brna) srna = RNA_def_struct(brna, "ColorManagedViewSettings", NULL); RNA_def_struct_ui_text(srna, "ColorManagedViewSettings", "Color management settings used for displaying images on the display"); - prop= RNA_def_property(srna, "view_transform", PROP_ENUM, PROP_NONE); + prop = RNA_def_property(srna, "view_transform", PROP_ENUM, PROP_NONE); RNA_def_property_enum_items(prop, view_transform_items); RNA_def_property_enum_funcs(prop, "rna_ColorManagedViewSettings_view_transform_get", "rna_ColorManagedViewSettings_view_transform_set", @@ -945,7 +945,7 @@ static void rna_def_colormanage(BlenderRNA *brna) srna = RNA_def_struct(brna, "ColorManagedColorspaceSettings", NULL); RNA_def_struct_ui_text(srna, "ColorManagedColorspaceSettings", "Input color space settings"); - prop= RNA_def_property(srna, "name", PROP_ENUM, PROP_NONE); + prop = RNA_def_property(srna, "name", PROP_ENUM, PROP_NONE); RNA_def_property_enum_items(prop, color_space_items); RNA_def_property_enum_funcs(prop, "rna_ColorManagedColorspaceSettings_colorspace_get", "rna_ColorManagedColorspaceSettings_colorspace_set", |