[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [27576] branches/render25: RNA/Py API

[Campbell Barton]

Revision: 27576
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=27576
Author:   campbellbarton
Date:     2010-03-17 20:40:22 +0100 (Wed, 17 Mar 2010)

Log Message:
-----------
RNA/Py API
bpy.data.add_image(filename) --> bpy.data.image.load(filename)
Added bpy.data.images.new(name, width, height, float_buffer)

Modified Paths:
--------------
    branches/render25/release/scripts/io/import_scene_obj.py
    branches/render25/source/blender/makesrna/RNA_types.h
    branches/render25/source/blender/makesrna/intern/rna_main_api.c
    branches/render25/source/creator/creator.c

Modified: branches/render25/release/scripts/io/import_scene_obj.py
===================================================================
--- branches/render25/release/scripts/io/import_scene_obj.py	2010-03-17 16:13:49 UTC (rev 27575)
+++ branches/render25/release/scripts/io/import_scene_obj.py	2010-03-17 19:40:22 UTC (rev 27576)
@@ -316,7 +316,7 @@
 def load_image(imagepath, dirname):
 
     if os.path.exists(imagepath):
-        return bpy.data.add_image(imagepath)
+        return bpy.data.images.load(imagepath)
 
     variants = [os.path.join(dirname, imagepath), os.path.join(dirname, os.path.basename(imagepath))]
 

Modified: branches/render25/source/blender/makesrna/RNA_types.h
===================================================================
--- branches/render25/source/blender/makesrna/RNA_types.h	2010-03-17 16:13:49 UTC (rev 27575)
+++ branches/render25/source/blender/makesrna/RNA_types.h	2010-03-17 19:40:22 UTC (rev 27576)
@@ -334,6 +334,7 @@
 #define MainMaterials Main
 #define MainMeshes Main
 #define MainLamps Main
+#define MainImages Main
 #define MainObjects Main
 #define MainTexts Main
 #define MainActions Main

Modified: branches/render25/source/blender/makesrna/intern/rna_main_api.c
===================================================================
--- branches/render25/source/blender/makesrna/intern/rna_main_api.c	2010-03-17 16:13:49 UTC (rev 27575)
+++ branches/render25/source/blender/makesrna/intern/rna_main_api.c	2010-03-17 19:40:22 UTC (rev 27576)
@@ -69,11 +69,6 @@
 	return add_texture(name);
 }
 
-Image *rna_Main_add_image(Main *bmain, char *filename)
-{
-	return BKE_add_image_file(filename, 0);
-}
-
 Camera *rna_Main_cameras_new(Main *bmain, char* name)
 {
 	return add_camera(name);
@@ -225,6 +220,27 @@
 	/* XXX python now has invalid pointer? */
 }
 
+Image *rna_Main_images_new(Main *bmain, char* name, int width, int height, int float_buffer)
+{
+	float color[4]= {0.0, 0.0, 0.0, 1.0};
+	Image *image= BKE_add_image_size(width, height, name, float_buffer, 0, color);
+	image->id.us--;
+	return image;
+}
+Image *rna_Main_images_load(Main *bmain, char *filename)
+{
+	return BKE_add_image_file(filename, 0);
+}
+void rna_Main_images_remove(Main *bmain, ReportList *reports, Image *image)
+{
+	if(ID_REAL_USERS(image) <= 0)
+		free_libblock(&bmain->image, image);
+	else
+		BKE_reportf(reports, RPT_ERROR, "Image \"%s\" must have zero users to be removed, found %d.", image->id.name+2, ID_REAL_USERS(image));
+
+	/* XXX python now has invalid pointer? */
+}
+
 Tex *rna_Main_textures_new(Main *bmain, char* name)
 {
 	Tex *tex= add_texture(name);
@@ -307,15 +323,20 @@
 
 void RNA_api_main(StructRNA *srna)
 {
+	/*
 	FunctionRNA *func;
 	PropertyRNA *parm;
-
+	*/
+	/* maybe we want to add functions in 'bpy.data' still?
+	 * for now they are all in collections bpy.data.images.new(...) */
+	/*
 	func= RNA_def_function(srna, "add_image", "rna_Main_add_image");
 	RNA_def_function_ui_description(func, "Add a new image.");
 	parm= RNA_def_string(func, "filename", "", 0, "", "Filename to load image from.");
 	RNA_def_property_flag(parm, PROP_REQUIRED);
 	parm= RNA_def_pointer(func, "image", "Image", "", "New image.");
 	RNA_def_function_return(func, parm);
+	*/
 
 }
 
@@ -489,8 +510,40 @@
 }
 void RNA_def_main_images(BlenderRNA *brna, PropertyRNA *cprop)
 {
+	StructRNA *srna;
+	FunctionRNA *func;
+	PropertyRNA *parm;
 
+	RNA_def_property_srna(cprop, "MainImages");
+	srna= RNA_def_struct(brna, "MainImages", NULL);
+	RNA_def_struct_ui_text(srna, "Main Images", "Collection of images");
+
+	func= RNA_def_function(srna, "new", "rna_Main_images_new");
+	RNA_def_function_ui_description(func, "Add a new image to the main database");
+	parm= RNA_def_string(func, "name", "Image", 0, "", "New name for the datablock.");
+	RNA_def_property_flag(parm, PROP_REQUIRED);
+	parm= RNA_def_int(func, "width", 1024, 1, INT_MAX, "", "Width of the image.", 0, INT_MAX);
+	parm= RNA_def_int(func, "height", 1024, 1, INT_MAX, "", "Height of the image.", 0, INT_MAX);
+	parm= RNA_def_boolean(func, "float_buffer", 0, "Float Buffer", "Create an image with floating point color");
+	/* return type */
+	parm= RNA_def_pointer(func, "image", "Image", "", "New image datablock.");
+	RNA_def_function_return(func, parm);
+
+	func= RNA_def_function(srna, "load", "rna_Main_images_load");
+	RNA_def_function_ui_description(func, "Load a new image into the main database");
+	parm= RNA_def_string(func, "filename", "File Name", 0, "", "path of the file to load.");
+	RNA_def_property_flag(parm, PROP_REQUIRED);
+	/* return type */
+	parm= RNA_def_pointer(func, "image", "Image", "", "New image datablock.");
+	RNA_def_function_return(func, parm);
+
+	func= RNA_def_function(srna, "remove", "rna_Main_images_remove");
+	RNA_def_function_flag(func, FUNC_USE_REPORTS);
+	RNA_def_function_ui_description(func, "Remove an image from the current blendfile.");
+	parm= RNA_def_pointer(func, "image", "Image", "", "Image to remove.");
+	RNA_def_property_flag(parm, PROP_REQUIRED);
 }
+
 void RNA_def_main_lattices(BlenderRNA *brna, PropertyRNA *cprop)
 {
 

Modified: branches/render25/source/creator/creator.c
===================================================================
--- branches/render25/source/creator/creator.c	2010-03-17 16:13:49 UTC (rev 27575)
+++ branches/render25/source/creator/creator.c	2010-03-17 19:40:22 UTC (rev 27576)
@@ -162,6 +162,7 @@
 }
 
 /* buildinfo can have quotes */
+#ifdef BUILD_DATE
 static void strip_quotes(char *str)
 {
     if(str[0] == '"') {
@@ -172,6 +173,7 @@
         }
     }
 }
+#endif
 
 static int print_version(int argc, char **argv, void *data)
 {