[Bf-blender-cvs] [e3812b5] multi_previews_id: Merge branch 'master' into multi_previews_id
Bastien Montagne
noreply at git.blender.org
Thu Dec 15 12:10:35 CET 2016
Commit: e3812b525f409d6f243c7ac6b1a52007148ad3e2
Author: Bastien Montagne
Date: Thu Dec 15 11:56:59 2016 +0100
Branches: multi_previews_id
https://developer.blender.org/rBe3812b525f409d6f243c7ac6b1a52007148ad3e2
Merge branch 'master' into multi_previews_id
Conflicts:
source/blender/editors/interface/interface_widgets.c
===================================================================
===================================================================
diff --cc source/blender/editors/interface/interface_widgets.c
index a464a8d,d43a94c..88a9127
--- a/source/blender/editors/interface/interface_widgets.c
+++ b/source/blender/editors/interface/interface_widgets.c
@@@ -1587,11 -1583,11 +1585,11 @@@ static void widget_draw_text_icon(uiFon
temp.xmin = temp.xmax - (BLI_rcti_size_y(rect) * 1.08f);
- if (extra_icon_type == UI_BUT_ICONEXTRA_UNLINK) {
+ if (extra_icon_type == UI_BUT_ICONEXTRA_CLEAR) {
- widget_draw_icon(but, ICON_X, alpha, &temp, false);
+ widget_draw_icon(but, ICON_X, 0, alpha, &temp, false);
}
else if (extra_icon_type == UI_BUT_ICONEXTRA_EYEDROPPER) {
- widget_draw_icon(but, ICON_EYEDROPPER, alpha, &temp, false);
+ widget_draw_icon(but, ICON_EYEDROPPER, 0, alpha, &temp, false);
}
else {
BLI_assert(0);
diff --cc source/blender/makesrna/intern/rna_image_api.c
index 2889b5f,344c178..ff08d84
--- a/source/blender/makesrna/intern/rna_image_api.c
+++ b/source/blender/makesrna/intern/rna_image_api.c
@@@ -361,17 -314,9 +361,17 @@@ void RNA_api_image(StructRNA *srna
RNA_def_function_ui_description(func, "Save image to a specific path using a scenes render settings");
RNA_def_function_flag(func, FUNC_USE_CONTEXT | FUNC_USE_REPORTS);
parm = RNA_def_string_file_path(func, "filepath", NULL, 0, "", "Save path");
- RNA_def_property_flag(parm, PROP_REQUIRED);
+ RNA_def_parameter_flags(parm, 0, PARM_REQUIRED);
RNA_def_pointer(func, "scene", "Scene", "", "Scene to take image parameters from");
+ func = RNA_def_function(srna, "copy_from_render", "rna_Image_copy_from_render");
+ RNA_def_function_ui_description(func, "Return a new, regular image, copy of given render result one");
+ RNA_def_function_flag(func, FUNC_USE_CONTEXT | FUNC_USE_REPORTS);
+ RNA_def_pointer(func, "scene", "Scene", "", "Scene to take image parameters from");
+ parm = RNA_def_pointer(func, "image", "Image", "",
+ "Copied image from this render result one");
+ RNA_def_function_return(func, parm);
+
func = RNA_def_function(srna, "save", "rna_Image_save");
RNA_def_function_ui_description(func, "Save image to its source path");
RNA_def_function_flag(func, FUNC_USE_MAIN | FUNC_USE_CONTEXT | FUNC_USE_REPORTS);
More information about the Bf-blender-cvs
mailing list