[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [37167] branches/soc-2011-onion: Revision: 29573

[Jason Wilkins]

Revision: 37167
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=37167
Author:   jwilkins
Date:     2011-06-04 06:12:41 +0000 (Sat, 04 Jun 2011)
Log Message:
-----------
Revision: 29573
Author: nicholasbishop
Date: 6:54:22 PM, Saturday, June 19, 2010
Message:
* Changed a couple mesh functions to make them public within the editors module

Modified Paths:
--------------
    branches/soc-2011-onion/source/blender/editors/include/ED_mesh.h
    branches/soc-2011-onion/source/blender/editors/mesh/mesh_data.c

Property Changed:
----------------
    branches/soc-2011-onion/


Property changes on: branches/soc-2011-onion
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/soc-2010-jwilkins:28499-37009
/branches/soc-2010-nicolasbishop:28448-29483,29503,29514,29536,29572
/trunk/blender:36833-37054
   + /branches/soc-2010-jwilkins:28499-37009
/branches/soc-2010-nicolasbishop:28448-29483,29503,29514,29536,29572-29573
/trunk/blender:36833-37054

Modified: branches/soc-2011-onion/source/blender/editors/include/ED_mesh.h
===================================================================
--- branches/soc-2011-onion/source/blender/editors/include/ED_mesh.h	2011-06-04 06:07:45 UTC (rev 37166)
+++ branches/soc-2011-onion/source/blender/editors/include/ED_mesh.h	2011-06-04 06:12:41 UTC (rev 37167)
@@ -66,6 +66,7 @@
 struct Material;
 struct Object;
 struct rcti;
+struct CustomDataLayer;
 
 #define EM_FGON_DRAW	1 // face flag
 #define EM_FGON			2 // edge and face flag both
@@ -231,6 +232,9 @@
 void ED_mesh_edges_add(struct Mesh *mesh, struct ReportList *reports, int count);
 void ED_mesh_vertices_add(struct Mesh *mesh, struct ReportList *reports, int count);
 
+void ED_mesh_delete_customdata_layer(struct bContext *C, struct Object *ob, struct CustomDataLayer *layer);
+
+void ED_mesh_geometry_add(struct Mesh *mesh, struct ReportList *reports, int verts, int edges, int faces);
 void ED_mesh_transform(struct Mesh *me, float *mat);
 void ED_mesh_calc_normals(struct Mesh *me);
 void ED_mesh_material_link(struct Mesh *me, struct Material *ma);
@@ -241,6 +245,8 @@
 int ED_mesh_color_add(struct bContext *C, struct Scene *scene, struct Object *ob, struct Mesh *me, const char *name, int active_set);
 int ED_mesh_color_remove(struct bContext *C, struct Object *ob, struct Mesh *me);
 
+int ED_mesh_layers_poll(struct bContext *C);
+
 #ifdef __cplusplus
 }
 #endif

Modified: branches/soc-2011-onion/source/blender/editors/mesh/mesh_data.c
===================================================================
--- branches/soc-2011-onion/source/blender/editors/mesh/mesh_data.c	2011-06-04 06:07:45 UTC (rev 37166)
+++ branches/soc-2011-onion/source/blender/editors/mesh/mesh_data.c	2011-06-04 06:12:41 UTC (rev 37167)
@@ -72,7 +72,7 @@
 
 #include "mesh_intern.h"
 
-static void delete_customdata_layer(bContext *C, Object *ob, CustomDataLayer *layer)
+void ED_mesh_delete_customdata_layer(bContext *C, Object *ob, CustomDataLayer *layer)
 {
 	Mesh *me = ob->data;
 	CustomData *data= (me->edit_mesh)? &me->edit_mesh->fdata: &me->fdata;
@@ -228,7 +228,7 @@
 	if(!cdl)
 		return 0;
 
-	delete_customdata_layer(C, ob, cdl);
+	ED_mesh_delete_customdata_layer(C, ob, cdl);
 	DAG_id_tag_update(&me->id, 0);
 	WM_event_add_notifier(C, NC_GEOM|ND_DATA, me);
 
@@ -295,7 +295,7 @@
 	if(!cdl)
 		return 0;
 
-	delete_customdata_layer(C, ob, cdl);
+	ED_mesh_delete_customdata_layer(C, ob, cdl);
 	DAG_id_tag_update(&me->id, 0);
 	WM_event_add_notifier(C, NC_GEOM|ND_DATA, me);
 
@@ -304,7 +304,7 @@
 
 /*********************** UV texture operators ************************/
 
-static int layers_poll(bContext *C)
+int ED_mesh_layers_poll(bContext *C)
 {
 	Object *ob= CTX_data_pointer_get_type(C, "object", &RNA_Object).data;
 	ID *data= (ob)? ob->data: NULL;
@@ -330,7 +330,7 @@
 	ot->idname= "MESH_OT_uv_texture_add";
 	
 	/* api callbacks */
-	ot->poll= layers_poll;
+	ot->poll= ED_mesh_layers_poll;
 	ot->exec= uv_texture_add_exec;
 
 	/* flags */
@@ -409,7 +409,7 @@
 	ot->idname= "MESH_OT_drop_named_image";
 	
 	/* api callbacks */
-	ot->poll= layers_poll;
+	ot->poll= ED_mesh_layers_poll;
 	ot->invoke= drop_named_image_invoke;
 	
 	/* flags */
@@ -439,7 +439,7 @@
 	ot->idname= "MESH_OT_uv_texture_remove";
 	
 	/* api callbacks */
-	ot->poll= layers_poll;
+	ot->poll= ED_mesh_layers_poll;
 	ot->exec= uv_texture_remove_exec;
 
 	/* flags */
@@ -468,7 +468,7 @@
 	ot->idname= "MESH_OT_vertex_color_add";
 	
 	/* api callbacks */
-	ot->poll= layers_poll;
+	ot->poll= ED_mesh_layers_poll;
 	ot->exec= vertex_color_add_exec;
 
 	/* flags */
@@ -495,7 +495,7 @@
 	
 	/* api callbacks */
 	ot->exec= vertex_color_remove_exec;
-	ot->poll= layers_poll;
+	ot->poll= ED_mesh_layers_poll;
 
 	/* flags */
 	ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
@@ -529,7 +529,7 @@
 	ot->idname= "MESH_OT_sticky_add";
 	
 	/* api callbacks */
-	ot->poll= layers_poll;
+	ot->poll= ED_mesh_layers_poll;
 	ot->exec= sticky_add_exec;
 
 	/* flags */
@@ -561,7 +561,7 @@
 	ot->idname= "MESH_OT_sticky_remove";
 	
 	/* api callbacks */
-	ot->poll= layers_poll;
+	ot->poll= ED_mesh_layers_poll;
 	ot->exec= sticky_remove_exec;
 
 	/* flags */