[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [43434] branches/soc-2011-onion-uv-tools/ source/blender/editors: move specialised poll functions to uvedit_ops.c

[Antony Riakiotakis]

Revision: 43434
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=43434
Author:   psy-fi
Date:     2012-01-16 23:45:44 +0000 (Mon, 16 Jan 2012)
Log Message:
-----------
move specialised poll functions to uvedit_ops.c

Modified Paths:
--------------
    branches/soc-2011-onion-uv-tools/source/blender/editors/include/ED_screen.h
    branches/soc-2011-onion-uv-tools/source/blender/editors/screen/screen_ops.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/uvedit/uvedit_ops.c

Modified: branches/soc-2011-onion-uv-tools/source/blender/editors/include/ED_screen.h
===================================================================
--- branches/soc-2011-onion-uv-tools/source/blender/editors/include/ED_screen.h	2012-01-16 20:10:38 UTC (rev 43433)
+++ branches/soc-2011-onion-uv-tools/source/blender/editors/include/ED_screen.h	2012-01-16 23:45:44 UTC (rev 43434)
@@ -168,9 +168,7 @@
 int		ED_operator_editlattice(struct bContext *C);
 int		ED_operator_editmball(struct bContext *C);
 int		ED_operator_uvedit(struct bContext *C);
-int		ED_operator_uvedit_can_uv_sculpt(struct bContext *C);
 int		ED_operator_uvmap(struct bContext *C);
-int		ED_operator_uvmap_mesh(struct bContext *C);
 int		ED_operator_uv_seam_tag_check_active(struct bContext *C);
 int		ED_operator_posemode(struct bContext *C);
 

Modified: branches/soc-2011-onion-uv-tools/source/blender/editors/screen/screen_ops.c
===================================================================
--- branches/soc-2011-onion-uv-tools/source/blender/editors/screen/screen_ops.c	2012-01-16 20:10:38 UTC (rev 43433)
+++ branches/soc-2011-onion-uv-tools/source/blender/editors/screen/screen_ops.c	2012-01-16 23:45:44 UTC (rev 43434)
@@ -363,16 +363,6 @@
 	return ED_space_image_show_uvedit(sima, obedit);
 }
 
-int	ED_operator_uvedit_can_uv_sculpt(struct bContext *C)
-{
-	SpaceImage *sima= CTX_wm_space_image(C);
-	ToolSettings *toolsettings = CTX_data_tool_settings(C);
-	Object *obedit= CTX_data_edit_object(C);
-
-	return ED_space_image_show_uvedit(sima, obedit) && !(toolsettings->use_uv_sculpt);
-}
-
-
 int ED_operator_uvmap(bContext *C)
 {
 	Object *obedit= CTX_data_edit_object(C);
@@ -391,20 +381,6 @@
 	return 0;
 }
 
-int ED_operator_uvmap_mesh(bContext *C)
-{
-	Object *ob= CTX_data_active_object(C);
-
-	if(ob && ob->type==OB_MESH) {
-		Mesh *me = ob->data;
-
-		if(CustomData_get_layer(&me->fdata, CD_MTFACE) != NULL)
-			return 1;
-	}
-
-	return 0;
-}
-
 int ED_operator_editsurfcurve(bContext *C)
 {
 	Object *obedit= CTX_data_edit_object(C);

Modified: branches/soc-2011-onion-uv-tools/source/blender/editors/uvedit/uvedit_ops.c
===================================================================
--- branches/soc-2011-onion-uv-tools/source/blender/editors/uvedit/uvedit_ops.c	2012-01-16 20:10:38 UTC (rev 43433)
+++ branches/soc-2011-onion-uv-tools/source/blender/editors/uvedit/uvedit_ops.c	2012-01-16 23:45:44 UTC (rev 43434)
@@ -94,6 +94,28 @@
 	return ret;
 }
 
+static int ED_operator_uvedit_can_uv_sculpt(struct bContext *C)
+{
+	SpaceImage *sima= CTX_wm_space_image(C);
+	ToolSettings *toolsettings = CTX_data_tool_settings(C);
+	Object *obedit= CTX_data_edit_object(C);
+
+	return ED_space_image_show_uvedit(sima, obedit) && !(toolsettings->use_uv_sculpt);
+}
+
+static int ED_operator_uvmap_mesh(bContext *C)
+{
+	Object *ob= CTX_data_active_object(C);
+
+	if(ob && ob->type==OB_MESH) {
+		Mesh *me = ob->data;
+
+		if(CustomData_get_layer(&me->fdata, CD_MTFACE) != NULL)
+			return 1;
+	}
+
+	return 0;
+}
 /**************************** object active image *****************************/
 
 static int is_image_texture_node(bNode *node)