diff options
author | Campbell Barton <ideasman42@gmail.com> | 2018-07-10 18:28:19 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2018-07-10 18:31:13 +0300 |
commit | 2574ee3d3878c8a78fb2ff1955b10ed20f0ad892 (patch) | |
tree | b9bb382b855df1777bbad092692fe2450b47bcfa /source/blender/makesrna | |
parent | c10ece49baea0458f44668d8ad92764c2c361c90 (diff) |
Image: remove fields option for image sequences
Remove support for loading interlaced image sequences because
its less common now to record interlaced video,
the option to de-interlace video on load remains.
Diffstat (limited to 'source/blender/makesrna')
-rw-r--r-- | source/blender/makesrna/intern/rna_image.c | 49 |
1 files changed, 0 insertions, 49 deletions
diff --git a/source/blender/makesrna/intern/rna_image.c b/source/blender/makesrna/intern/rna_image.c index 3d12debe0b5..1759eb812e6 100644 --- a/source/blender/makesrna/intern/rna_image.c +++ b/source/blender/makesrna/intern/rna_image.c @@ -99,27 +99,6 @@ static void rna_Image_source_set(PointerRNA *ptr, int value) } } -static void rna_Image_fields_update(Main *bmain, Scene *UNUSED(scene), PointerRNA *ptr) -{ - Image *ima = ptr->id.data; - ImBuf *ibuf; - void *lock; - - ibuf = BKE_image_acquire_ibuf(ima, NULL, &lock); - - if (ibuf) { - short nr = 0; - - if (!(ima->flag & IMA_FIELDS) && (ibuf->flags & IB_fields)) nr = 1; - if ((ima->flag & IMA_FIELDS) && !(ibuf->flags & IB_fields)) nr = 1; - - if (nr) - BKE_image_signal(bmain, ima, NULL, IMA_SIGNAL_FREE); - } - - BKE_image_release_ibuf(ima, ibuf, lock); -} - static void rna_Image_reload_update(Main *bmain, Scene *UNUSED(scene), PointerRNA *ptr) { Image *ima = ptr->id.data; @@ -562,13 +541,6 @@ static void rna_def_imageuser(BlenderRNA *brna) RNA_def_property_update(prop, 0, "rna_ImageUser_update"); RNA_def_property_clear_flag(prop, PROP_ANIMATABLE); - prop = RNA_def_property(srna, "fields_per_frame", PROP_INT, PROP_NONE); - RNA_def_property_int_sdna(prop, NULL, "fie_ima"); - RNA_def_property_range(prop, 1, 200); - RNA_def_property_ui_text(prop, "Fields per Frame", "Number of fields per rendered frame (2 fields is 1 image)"); - RNA_def_property_update(prop, 0, "rna_ImageUser_update"); - RNA_def_property_clear_flag(prop, PROP_ANIMATABLE); - prop = RNA_def_property(srna, "multilayer_layer", PROP_INT, PROP_UNSIGNED); RNA_def_property_int_sdna(prop, NULL, "layer"); RNA_def_property_clear_flag(prop, PROP_EDITABLE); /* image_multi_cb */ @@ -672,11 +644,6 @@ static void rna_def_image(BlenderRNA *brna) {IMA_TYPE_COMPOSITE, "COMPOSITING", 0, "Compositing", ""}, {0, NULL, 0, NULL, NULL} }; - static const EnumPropertyItem prop_field_order_items[] = { - {0, "EVEN", 0, "Upper First", "Upper field first"}, - {IMA_STD_FIELD, "ODD", 0, "Lower First", "Lower field first"}, - {0, NULL, 0, NULL, NULL} - }; static const EnumPropertyItem alpha_mode_items[] = { {IMA_ALPHA_STRAIGHT, "STRAIGHT", 0, "Straight", "Transparent RGB and alpha pixels are unmodified"}, {IMA_ALPHA_PREMUL, "PREMUL", 0, "Premultiplied", "Transparent RGB pixels are multiplied by the alpha channel"}, @@ -727,22 +694,6 @@ static void rna_def_image(BlenderRNA *brna) RNA_def_property_clear_flag(prop, PROP_EDITABLE); RNA_def_property_ui_text(prop, "Packed Files", "Collection of packed images"); - prop = RNA_def_property(srna, "field_order", PROP_ENUM, PROP_NONE); - RNA_def_property_override_flag(prop, PROPOVERRIDE_OVERRIDABLE_STATIC); - RNA_def_property_enum_bitflag_sdna(prop, NULL, "flag"); - RNA_def_property_enum_items(prop, prop_field_order_items); - RNA_def_property_ui_text(prop, "Field Order", "Order of video fields (select which lines are displayed first)"); - RNA_def_property_update(prop, NC_IMAGE | ND_DISPLAY, NULL); - - /* booleans */ - prop = RNA_def_property(srna, "use_fields", PROP_BOOLEAN, PROP_NONE); - RNA_def_property_override_flag(prop, PROPOVERRIDE_OVERRIDABLE_STATIC); - RNA_def_property_boolean_sdna(prop, NULL, "flag", IMA_FIELDS); - RNA_def_property_ui_text(prop, "Fields", "Use fields of the image"); - RNA_def_property_update(prop, NC_IMAGE | ND_DISPLAY, "rna_Image_fields_update"); - RNA_def_property_clear_flag(prop, PROP_ANIMATABLE); - - prop = RNA_def_property(srna, "use_view_as_render", PROP_BOOLEAN, PROP_NONE); RNA_def_property_override_flag(prop, PROPOVERRIDE_OVERRIDABLE_STATIC); RNA_def_property_boolean_sdna(prop, NULL, "flag", IMA_VIEW_AS_RENDER); |