[Bf-blender-cvs] [0a1942f] multiview: Show Multi-View for EXR images only in wite/save related UIs

[Dalai Felinto]

Commit: 0a1942fbb418d0a8a45b844a0e93e2f4153ca516
Author: Dalai Felinto
Date:   Mon Mar 23 17:59:03 2015 +0100
Branches: multiview
https://developer.blender.org/rB0a1942fbb418d0a8a45b844a0e93e2f4153ca516

Show Multi-View for EXR images only in wite/save related UIs

===================================================================

M	source/blender/makesrna/intern/rna_image.c
M	source/blender/makesrna/intern/rna_sequencer.c

===================================================================

diff --git a/source/blender/makesrna/intern/rna_image.c b/source/blender/makesrna/intern/rna_image.c
index dea8393..bac5c4a 100644
--- a/source/blender/makesrna/intern/rna_image.c
+++ b/source/blender/makesrna/intern/rna_image.c
@@ -138,22 +138,6 @@ static void rna_Image_colormanage_update(Main *UNUSED(bmain), Scene *UNUSED(scen
 	WM_main_add_notifier(NC_IMAGE | NA_EDITED, &ima->id);
 }
 
-static EnumPropertyItem *rna_Image_views_format_itemf(bContext *UNUSED(C), PointerRNA *ptr,
-                                                      PropertyRNA *UNUSED(prop), bool *UNUSED(r_free))
-{
-	Image *ima = (Image *)ptr->data;
-
-	if (BKE_image_is_openexr(ima)) {
-		if (ima->rr)
-			return views_format_multilayer_items;
-		else
-			return views_format_multiview_items;
-	}
-	else {
-		return views_format_items;
-	}
-}
-
 static void rna_Image_views_format_update(Main *UNUSED(bmain), Scene *scene, PointerRNA *ptr)
 {
 	Image *ima = ptr->id.data;
@@ -924,8 +908,7 @@ static void rna_def_image(BlenderRNA *brna)
 	prop = RNA_def_property(srna, "views_format", PROP_ENUM, PROP_NONE);
 	RNA_def_property_enum_sdna(prop, NULL, "views_format");
 	RNA_def_property_enum_items(prop, views_format_items);
-	RNA_def_property_enum_funcs(prop, NULL, NULL, "rna_Image_views_format_itemf");
-	RNA_def_property_ui_text(prop, "Views Format", "Mode to save scene views");
+	RNA_def_property_ui_text(prop, "Views Format", "Mode to load image views");
 	RNA_def_property_update(prop, NC_IMAGE | ND_DISPLAY, "rna_Image_views_format_update");
 
 	prop = RNA_def_property(srna, "stereo_3d_format", PROP_POINTER, PROP_NONE);
diff --git a/source/blender/makesrna/intern/rna_sequencer.c b/source/blender/makesrna/intern/rna_sequencer.c
index 0cfd27d..5a7fe2a 100644
--- a/source/blender/makesrna/intern/rna_sequencer.c
+++ b/source/blender/makesrna/intern/rna_sequencer.c
@@ -177,16 +177,6 @@ static void rna_SequenceEditor_elements_begin(CollectionPropertyIterator *iter,
 	                         rna_SequenceEditor_elements_length(ptr), 0, NULL);
 }
 
-static EnumPropertyItem *rna_Sequence_views_format_itemf(bContext *UNUSED(C), PointerRNA *ptr,
-                                                         PropertyRNA *UNUSED(prop), bool *UNUSED(r_free))
-{
-	Sequence *seq = (Sequence *)ptr->data;
-	if (BLI_testextensie(seq->strip->stripdata->name, ".exr"))
-		return views_format_multiview_items;
-	else
-		return views_format_items;
-}
-
 static void rna_Sequence_views_format_update(Main *bmain, Scene *scene, PointerRNA *ptr)
 {
 	rna_Sequence_update(bmain, scene, ptr);
@@ -1822,8 +1812,7 @@ static void rna_def_image(BlenderRNA *brna)
 	prop = RNA_def_property(srna, "views_format", PROP_ENUM, PROP_NONE);
 	RNA_def_property_enum_sdna(prop, NULL, "views_format");
 	RNA_def_property_enum_items(prop, views_format_items);
-	RNA_def_property_enum_funcs(prop, NULL, NULL, "rna_Sequence_views_format_itemf");
-	RNA_def_property_ui_text(prop, "Views Format", "Mode to save scene views");
+	RNA_def_property_ui_text(prop, "Views Format", "Mode to load image views");
 	RNA_def_property_update(prop, NC_IMAGE | ND_DISPLAY, "rna_Sequence_views_format_update");
 
 	prop = RNA_def_property(srna, "stereo_3d_format", PROP_POINTER, PROP_NONE);
@@ -1932,8 +1921,7 @@ static void rna_def_movie(BlenderRNA *brna)
 	prop = RNA_def_property(srna, "views_format", PROP_ENUM, PROP_NONE);
 	RNA_def_property_enum_sdna(prop, NULL, "views_format");
 	RNA_def_property_enum_items(prop, views_format_items);
-	RNA_def_property_enum_funcs(prop, NULL, NULL, "rna_Sequence_views_format_itemf");
-	RNA_def_property_ui_text(prop, "Views Format", "Mode to save scene views");
+	RNA_def_property_ui_text(prop, "Views Format", "Mode to load movie views");
 	RNA_def_property_update(prop, NC_IMAGE | ND_DISPLAY, "rna_Sequence_views_format_update");
 
 	prop = RNA_def_property(srna, "stereo_3d_format", PROP_POINTER, PROP_NONE);