- added API functions:

 - Mesh.calc_normals
 - Object.add_vertex_to_group
 - Main.add_material
 - Main.add_texture
 - Material.add_texture
- OBJ importer conversion in progress

7 files changed, 195 insertions, 7 deletions

diff --git a/source/blender/makesrna/intern/makesrna.c b/source/blender/makesrna/intern/makesrna.c
index e779f901b3c..8a9fdb8531d 100644
--- a/source/blender/makesrna/intern/makesrna.c
+++ b/source/blender/makesrna/intern/makesrna.c
@@ -1911,7 +1911,7 @@ RNAProcessItem PROCESS_ITEMS[]= {
 	{"rna_lamp.c", NULL, RNA_def_lamp},
 	{"rna_lattice.c", NULL, RNA_def_lattice},
 	{"rna_main.c", "rna_main_api.c", RNA_def_main},
-	{"rna_material.c", NULL, RNA_def_material},
+	{"rna_material.c", "rna_material_api.c", RNA_def_material},
 	{"rna_mesh.c", "rna_mesh_api.c", RNA_def_mesh},
 	{"rna_meta.c", NULL, RNA_def_meta},
 	{"rna_modifier.c", NULL, RNA_def_modifier},
diff --git a/source/blender/makesrna/intern/rna_internal.h b/source/blender/makesrna/intern/rna_internal.h
index f465e733d68..7bf33760011 100644
--- a/source/blender/makesrna/intern/rna_internal.h
+++ b/source/blender/makesrna/intern/rna_internal.h
@@ -193,6 +193,7 @@ void RNA_api_object(struct StructRNA *srna);
 void RNA_api_ui_layout(struct StructRNA *srna);
 void RNA_api_wm(struct StructRNA *srna);
 void RNA_api_scene(struct StructRNA *srna); 
+void RNA_api_material(StructRNA *srna);
 
 /* ID Properties */
 
diff --git a/source/blender/makesrna/intern/rna_main_api.c b/source/blender/makesrna/intern/rna_main_api.c
index 08a3b7cee25..9dc32acff6f 100644
--- a/source/blender/makesrna/intern/rna_main_api.c
+++ b/source/blender/makesrna/intern/rna_main_api.c
@@ -40,6 +40,7 @@
 #include "BKE_mesh.h"
 #include "BKE_library.h"
 #include "BKE_object.h"
+#include "BKE_material.h"
 
 #include "DNA_mesh_types.h"
 
@@ -68,7 +69,7 @@ static Object* rna_Main_add_object(Main *main, int type, char *name)
 }
 
 /*
-  WARNING: the following example shows when this function should not be called
+  NOTE: the following example shows when this function should _not_ be called
 
   ob = bpy.data.add_object()
   scene.add_object(ob)
@@ -87,6 +88,20 @@ static void rna_Main_remove_object(Main *main, ReportList *reports, Object *ob)
 		BKE_report(reports, RPT_ERROR, "Object must have zero users to be removed.");
 }
 
+static Material *rna_Main_add_material(Main *main, char *name)
+{
+	return add_material(name);
+}
+
+/* TODO: remove material? */
+
+struct Tex *rna_Main_add_texture(Main *main, char *name)
+{
+	return add_texture(name);
+}
+
+/* TODO: remove texture? */
+
 #else
 
 void RNA_api_main(StructRNA *srna)
@@ -136,6 +151,19 @@ void RNA_api_main(StructRNA *srna)
 	RNA_def_function_ui_description(func, "Remove a mesh if it has zero users.");
 	parm= RNA_def_pointer(func, "mesh", "Mesh", "", "Mesh to remove.");
 	RNA_def_property_flag(parm, PROP_REQUIRED);
+
+	func= RNA_def_function(srna, "add_material", "rna_Main_add_material");
+	RNA_def_function_ui_description(func, "Add a new material.");
+	parm= RNA_def_string(func, "name", "Material", 0, "", "New name for the datablock."); /* optional */
+	parm= RNA_def_pointer(func, "material", "Material", "", "New material.");
+	RNA_def_function_return(func, parm);
+
+	func= RNA_def_function(srna, "add_texture", "rna_Main_add_texture");
+	RNA_def_function_ui_description(func, "Add a new texture.");
+	parm= RNA_def_string(func, "name", "Tex", 0, "", "New name for the datablock."); /* optional */
+	parm= RNA_def_pointer(func, "texture", "Texture", "", "New texture.");
+	RNA_def_function_return(func, parm);
+
 }
 
 #endif
diff --git a/source/blender/makesrna/intern/rna_material.c b/source/blender/makesrna/intern/rna_material.c
index 41f31594f6e..6de13dbd440 100644
--- a/source/blender/makesrna/intern/rna_material.c
+++ b/source/blender/makesrna/intern/rna_material.c
@@ -1134,6 +1134,8 @@ void RNA_def_material(BlenderRNA *brna)
 	rna_def_material_sss(brna);
 	rna_def_material_mtex(brna);
 	rna_def_material_strand(brna);
+
+	RNA_api_material(srna);
 }
 
 void rna_def_mtex_common(StructRNA *srna, const char *begin, const char *activeget, const char *structname)
diff --git a/source/blender/makesrna/intern/rna_material_api.c b/source/blender/makesrna/intern/rna_material_api.c
new file mode 100644
index 00000000000..e2b47460fdb
--- /dev/null
+++ b/source/blender/makesrna/intern/rna_material_api.c
@@ -0,0 +1,126 @@
+/**
+ *
+ *
+ * ***** BEGIN GPL LICENSE BLOCK *****
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version. 
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ *
+ * The Original Code is Copyright (C) 2009 Blender Foundation.
+ * All rights reserved.
+ *
+ * 
+ * Contributor(s): Blender Foundation
+ *
+ * ***** END GPL LICENSE BLOCK *****
+ */
+
+#include <stdlib.h>
+#include <stdio.h>
+
+#include "RNA_define.h"
+#include "RNA_types.h"
+
+#include "DNA_material_types.h"
+
+#ifdef RNA_RUNTIME
+
+#include "BKE_material.h"
+#include "BKE_texture.h"
+
+/*
+  Adds material to the first free texture slot.
+  If all slots are busy, replaces the first.
+*/
+static void rna_Material_add_texture(Material *ma, Tex *tex, int mapto, int texco)
+{
+	int i;
+	MTex *mtex;
+	int slot= -1;
+
+	for (i= 0; i < MAX_MTEX; i++) {
+		if (!ma->mtex[i]) {
+			slot= i;
+			break;
+		}
+	}
+
+	if (slot == -1)
+		slot= 0;
+
+	if (ma->mtex[slot]) {
+		ma->mtex[slot]->tex->id.us--;
+	}
+	else {
+		ma->mtex[slot]= add_mtex();
+	}
+
+	mtex= ma->mtex[slot];
+
+	mtex->tex= tex;
+	id_us_plus(&tex->id);
+
+	mtex->texco= mapto;
+	mtex->mapto= texco;
+}
+
+#else
+
+void RNA_api_material(StructRNA *srna)
+{
+	FunctionRNA *func;
+	PropertyRNA *parm;
+
+	/* copied from rna_def_material_mtex (rna_material.c) */
+	static EnumPropertyItem prop_texture_coordinates_items[] = {
+		{TEXCO_GLOB, "GLOBAL", 0, "Global", "Uses global coordinates for the texture coordinates."},
+		{TEXCO_OBJECT, "OBJECT", 0, "Object", "Uses linked object's coordinates for texture coordinates."},
+		{TEXCO_UV, "UV", 0, "UV", "Uses UV coordinates for texture coordinates."},
+		{TEXCO_ORCO, "ORCO", 0, "Generated", "Uses the original undeformed coordinates of the object."},
+		{TEXCO_STRAND, "STRAND", 0, "Strand", "Uses normalized strand texture coordinate (1D)."},
+		{TEXCO_STICKY, "STICKY", 0, "Sticky", "Uses mesh's sticky coordinates for the texture coordinates."},
+		{TEXCO_WINDOW, "WINDOW", 0, "Window", "Uses screen coordinates as texture coordinates."},
+		{TEXCO_NORM, "NORMAL", 0, "Normal", "Uses normal vector as texture coordinates."},
+		{TEXCO_REFL, "REFLECTION", 0, "Reflection", "Uses reflection vector as texture coordinates."},
+		{TEXCO_STRESS, "STRESS", 0, "Stress", "Uses the difference of edge lengths compared to original coordinates of the mesh."},
+		{TEXCO_TANGENT, "TANGENT", 0, "Tangent", "Uses the optional tangent vector as texture coordinates."},
+
+		{0, NULL, 0, NULL, NULL}};
+
+	static EnumPropertyItem prop_texture_mapto_items[] = {
+		{MAP_COL, "COLOR", 0, "Color", "Causes the texture to affect basic color of the material"},
+		{MAP_NORM, "NORMAL", 0, "Normal", "Causes the texture to affect the rendered normal"},
+		{MAP_COLSPEC, "SPEC_COLOR", 0, "Specularity Color", "Causes the texture to affect the specularity color"},
+		{MAP_COLMIR, "MIRROR", 0, "Mirror", "Causes the texture to affect the mirror color"},
+		{MAP_REF, "REFLECTION", 0, "Reflection", "Causes the texture to affect the value of the materials reflectivity"},
+		{MAP_SPEC, "SPECULARITY", 0, "Specularity", "Causes the texture to affect the value of specularity"},
+		{MAP_EMIT, "EMIT", 0, "Emit", "Causes the texture to affect the emit value"},
+		{MAP_ALPHA, "ALPHA", 0, "Alpha", "Causes the texture to affect the alpha value"},
+		{MAP_HAR, "HARDNESS", 0, "Hardness", "Causes the texture to affect the hardness value"},
+		{MAP_RAYMIRR, "RAY_MIRROR", 0, "Ray-Mirror", "Causes the texture to affect the ray-mirror value"},
+		{MAP_TRANSLU, "TRANSLUCENCY", 0, "Translucency", "Causes the texture to affect the translucency value"},
+		{MAP_AMB, "AMBIENT", 0, "Ambient", "Causes the texture to affect the value of ambient"},
+		{MAP_DISPLACE, "DISPLACEMENT", 0, "Displacement", "Let the texture displace the surface"},
+		{MAP_WARP, "WARP", 0, "Warp", "Let the texture warp texture coordinates of next channels"},
+		{0, NULL, 0, NULL, NULL}};
+
+	func= RNA_def_function(srna, "add_texture", "rna_Material_add_texture");
+	RNA_def_function_ui_description(func, "Add a texture to material's free texture slot.");
+	parm= RNA_def_pointer(func, "texture", "Texture", "", "Texture to add.");
+	parm= RNA_def_enum(func, "texture_coordinates", prop_texture_coordinates_items, TEXCO_UV, "", "Source of texture coordinate information."); /* optional */
+	parm= RNA_def_enum(func, "map_to", prop_texture_mapto_items, MAP_COL, "", "Controls which material property the texture affects."); /* optional */
+}
+
+#endif
+
diff --git a/source/blender/makesrna/intern/rna_mesh_api.c b/source/blender/makesrna/intern/rna_mesh_api.c
index ecc32b23249..b2157340207 100644
--- a/source/blender/makesrna/intern/rna_mesh_api.c
+++ b/source/blender/makesrna/intern/rna_mesh_api.c
@@ -253,6 +253,11 @@ static void rna_Mesh_add_uv_layer(Mesh *me)
 	me->mtface= CustomData_add_layer(&me->fdata, CD_MTFACE, CD_DEFAULT, NULL, me->totface);
 }
 
+static void rna_Mesh_calc_normals(Mesh *me)
+{
+	mesh_calc_normals(me->mvert, me->totvert, me->mface, me->totface, NULL);
+}
+
 #else
 
 void RNA_api_mesh(StructRNA *srna)
@@ -281,6 +286,9 @@ void RNA_api_mesh(StructRNA *srna)
 	func= RNA_def_function(srna, "add_uv_layer", "rna_Mesh_add_uv_layer");
 	RNA_def_function_ui_description(func, "Add new UV layer to Mesh.");
 
+	func= RNA_def_function(srna, "calc_normals", "rna_Mesh_calc_normals");
+	RNA_def_function_ui_description(func, "Calculate vertex normals.");
+
 	/*
 	func= RNA_def_function(srna, "add_geom", "rna_Mesh_add_geom");
 	RNA_def_function_ui_description(func, "Add geometry data to mesh.");
diff --git a/source/blender/makesrna/intern/rna_object_api.c b/source/blender/makesrna/intern/rna_object_api.c
index 9d1a6a39d51..02db7e83062 100644
--- a/source/blender/makesrna/intern/rna_object_api.c
+++ b/source/blender/makesrna/intern/rna_object_api.c
@@ -155,10 +155,15 @@ static void rna_Object_convert_to_triface(Object *ob, bContext *C, ReportList *r
 	DAG_object_flush_update(sce, ob, OB_RECALC_DATA);
 }
 
-static int rna_Object_add_vertex_group(Object *ob, char *group_name)
+static bDeformGroup *rna_Object_add_vertex_group(Object *ob, char *group_name)
 {
-	bDeformGroup *defgroup= add_defgroup_name(ob, group_name);
-	return BLI_findindex(&ob->defbase, defgroup);
+	return add_defgroup_name(ob, group_name);
+}
+
+static void rna_Object_add_vertex_to_group(Object *ob, int vertex_index, bDeformGroup *def, float weight, int assignmode)
+{
+	/* creates dverts if needed */
+	add_vert_to_defgroup(ob, def, vertex_index, weight, assignmode);
 }
 
 /*
@@ -210,6 +215,13 @@ void RNA_api_object(StructRNA *srna)
 		{0, NULL, 0, NULL, NULL}
 	};
 
+	static EnumPropertyItem assign_mode_items[] = {
+		{WEIGHT_REPLACE, "REPLACE", 0, "Replace", "Replace."}, /* TODO: more meaningful descriptions */
+		{WEIGHT_ADD, "ADD", 0, "Add", "Add."},
+		{WEIGHT_SUBTRACT, "SUBTRACT", 0, "Subtract", "Subtract."},
+		{0, NULL, 0, NULL, NULL}
+	};
+
 	func= RNA_def_function(srna, "create_mesh", "rna_Object_create_mesh");
 	RNA_def_function_ui_description(func, "Create a Mesh datablock with all modifiers applied.");
 	RNA_def_function_flag(func, FUNC_USE_CONTEXT|FUNC_USE_REPORTS);
@@ -234,9 +246,20 @@ void RNA_api_object(StructRNA *srna)
 
 	func= RNA_def_function(srna, "add_vertex_group", "rna_Object_add_vertex_group");
 	RNA_def_function_ui_description(func, "Add vertex group to object.");
-	parm= RNA_def_string(func, "name", "Group", 0, "", "Vertex group name.");
-	parm= RNA_def_int(func, "group_index", 0, 0, 0, "", "Index of the created vertex group.", 0, 0);
+	parm= RNA_def_string(func, "name", "Group", 0, "", "Vertex group name."); /* optional */
+	parm= RNA_def_pointer(func, "group", "VertexGroup", "", "New vertex group.");
 	RNA_def_function_return(func, parm);
+
+	func= RNA_def_function(srna, "add_vertex_to_group", "rna_Object_add_vertex_to_group");
+	RNA_def_function_ui_description(func, "Add vertex to a vertex group.");
+	parm= RNA_def_int(func, "vertex_index", 0, 0, 0, "", "Vertex index.", 0, 0);
+	RNA_def_property_flag(parm, PROP_REQUIRED);
+	parm= RNA_def_pointer(func, "group", "VertexGroup", "", "Vertex group to add vertex to.");
+	RNA_def_property_flag(parm, PROP_REQUIRED);
+	parm= RNA_def_float(func, "weight", 0, 0.0f, 1.0f, "", "Vertex weight.", 0.0f, 1.0f);
+	RNA_def_property_flag(parm, PROP_REQUIRED);
+	parm= RNA_def_enum(func, "type", assign_mode_items, 0, "", "Vertex assign mode.");
+	RNA_def_property_flag(parm, PROP_REQUIRED);
 }
 
 #endif