1 files changed, 105 insertions, 6 deletions

diff --git a/source/blender/makesrna/intern/rna_image_api.c b/source/blender/makesrna/intern/rna_image_api.c
index 892370a9f72..263603cbd36 100644
--- a/source/blender/makesrna/intern/rna_image_api.c
+++ b/source/blender/makesrna/intern/rna_image_api.c
@@ -32,7 +32,8 @@
 #include <time.h>
 
 #include "RNA_define.h"
-#include "RNA_types.h"
+
+#include "BIF_gl.h"
 
 #ifdef RNA_RUNTIME
 
@@ -40,9 +41,13 @@
 #include "BKE_packedFile.h"
 #include "BKE_main.h"
 #include "BKE_utildefines.h"
+#include "BKE_global.h" /* grr: G.sce */
 
 #include "IMB_imbuf.h"
 
+#include "BIF_gl.h"
+#include "GPU_draw.h"
+
 #include "DNA_image_types.h"
 #include "DNA_scene_types.h"
 
@@ -81,12 +86,21 @@ static void rna_Image_save(Image *image, ReportList *reports)
 {
 	ImBuf *ibuf= BKE_image_get_ibuf(image, NULL);
 	if(ibuf) {
+		char filename[FILE_MAXDIR + FILE_MAXFILE];
+		BLI_strncpy(filename, image->name, sizeof(filename));
+		BLI_path_abs(filename, G.sce);
+
 		if(image->packedfile) {
 			if (writePackedFile(reports, image->name, image->packedfile, 0) != RET_OK) {
 				BKE_reportf(reports, RPT_ERROR, "Image \"%s\" could saved packed file to \"%s\"", image->id.name+2, image->name);
 			}
 		}
-		else if (IMB_saveiff(ibuf, image->name, ibuf->flags)) {
+		else if (IMB_saveiff(ibuf, filename, ibuf->flags)) {
+			image->type= IMA_TYPE_IMAGE;
+
+			if(image->source==IMA_SRC_GENERATED)
+				image->source= IMA_SRC_FILE;
+
 			ibuf->userflags &= ~IB_BITMAPDIRTY;
 		}
 		else {
@@ -98,6 +112,70 @@ static void rna_Image_save(Image *image, ReportList *reports)
 	}
 }
 
+static void rna_Image_reload(Image *image)
+{
+	BKE_image_signal(image, NULL, IMA_SIGNAL_RELOAD);
+}
+
+static void rna_Image_update(Image *image, ReportList *reports)
+{
+	ImBuf *ibuf= BKE_image_get_ibuf(image, NULL);
+
+	if(ibuf == NULL) {
+		BKE_reportf(reports, RPT_ERROR, "Image \"%s\" does not have any image data", image->id.name+2);
+		return;
+	}
+
+	IMB_rect_from_float(ibuf);
+}
+
+static int rna_Image_gl_load(Image *image, ReportList *reports, int filter, int mag)
+{
+	ImBuf *ibuf;
+	unsigned int *bind = &image->bindcode;
+	int error = GL_NO_ERROR;
+
+	if(*bind)
+		return error;
+
+	ibuf= BKE_image_get_ibuf(image, NULL);
+
+ 	if(ibuf == NULL || ibuf->rect == NULL ) {
+		BKE_reportf(reports, RPT_ERROR, "Image \"%s\" does not have any image data", image->id.name+2);
+		return (int)GL_INVALID_OPERATION;
+	}
+
+	/* could be made into a function? */
+	glGenTextures(1, (GLuint*)bind);
+	glBindTexture(GL_TEXTURE_2D, *bind);
+
+	if (filter != GL_NEAREST && filter != GL_LINEAR)
+		error = (int)gluBuild2DMipmaps(GL_TEXTURE_2D, GL_RGBA, ibuf->x, ibuf->y, GL_RGBA, GL_UNSIGNED_INT, ibuf->rect);
+
+	if (!error) {
+		glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, (GLint)filter);
+		glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, (GLint)mag);
+		glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
+		glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, ibuf->x, ibuf->y, 0, GL_RGBA, GL_UNSIGNED_INT, ibuf->rect); 
+		error = (int)glGetError();
+	}
+
+	if (error) {
+		glDeleteTextures(1, (GLuint*)bind);
+		image->bindcode = 0;
+	}
+
+	return error;
+}
+
+static void rna_Image_gl_free(Image *image)
+{
+	GPU_free_image(image);
+
+	/* remove the nocollect flag, image is available for garbage collection again */
+	image->flag &= ~IMA_NOCOLLECT;
+}
+
 #else
 
 void RNA_api_image(StructRNA *srna)
@@ -106,15 +184,36 @@ void RNA_api_image(StructRNA *srna)
 	PropertyRNA *parm;
 
 	func= RNA_def_function(srna, "save_render", "rna_Image_save_render");
-	RNA_def_function_ui_description(func, "Save image to a specific path using a scenes render settings.");
+	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(func, "path", "", 0, "", "Save path.");
+	parm= RNA_def_string(func, "filepath", "", 0, "", "Save path.");
 	RNA_def_property_flag(parm, PROP_REQUIRED);
-	parm= RNA_def_pointer(func, "scene", "Scene", "", "Scene to take image parameters from.");
+	parm= RNA_def_pointer(func, "scene", "Scene", "", "Scene to take image parameters from");
 
 	func= RNA_def_function(srna, "save", "rna_Image_save");
-	RNA_def_function_ui_description(func, "Save image to its source path.");
+	RNA_def_function_ui_description(func, "Save image to its source path");
+	RNA_def_function_flag(func, FUNC_USE_REPORTS);
+
+	func= RNA_def_function(srna, "reload", "rna_Image_reload");
+	RNA_def_function_ui_description(func, "Reload the image from its source path");
+
+	func= RNA_def_function(srna, "update", "rna_Image_update");
+	RNA_def_function_ui_description(func, "Update the display image from the floating point buffer");
+	RNA_def_function_flag(func, FUNC_USE_REPORTS);
+
+	func= RNA_def_function(srna, "gl_load", "rna_Image_gl_load");
+	RNA_def_function_ui_description(func, "Load the image into OpenGL graphics memory");
 	RNA_def_function_flag(func, FUNC_USE_REPORTS);
+	parm= RNA_def_int(func, "filter", GL_LINEAR_MIPMAP_NEAREST, -INT_MAX, INT_MAX, "Filter", "The texture minifying function", -INT_MAX, INT_MAX);
+	parm= RNA_def_int(func, "mag", GL_LINEAR, -INT_MAX, INT_MAX, "Magnification", "The texture magnification function", -INT_MAX, INT_MAX);
+	/* return value */
+	parm= RNA_def_int(func, "error", 0, -INT_MAX, INT_MAX, "Error", "OpenGL error value", -INT_MAX, INT_MAX);
+	RNA_def_function_return(func, parm);
+
+	func= RNA_def_function(srna, "gl_free", "rna_Image_gl_free");
+	RNA_def_function_ui_description(func, "Free the image from OpenGL graphics memory");
+
+	/* TODO, pack/unpack, maybe should be generic functions? */
 }
 
 #endif