-Added Loop Cut to toolbar

-Adjusted some UV Editor panels slightly
-Made a few nodes clearer. The Crop node was especially confusing.

2 files changed, 19 insertions, 16 deletions

diff --git a/source/blender/editors/space_node/drawnode.c b/source/blender/editors/space_node/drawnode.c
index 9cfae9a7ef5..fadcda67d5b 100644
--- a/source/blender/editors/space_node/drawnode.c
+++ b/source/blender/editors/space_node/drawnode.c
@@ -1414,14 +1414,15 @@ static void node_composit_buts_lensdist(uiLayout *layout, PointerRNA *ptr)
 	bNode *node= ptr->data;
 	NodeLensDist *nld = node->storage;
 
-	col= uiLayoutColumn(layout, 1);
+	col= uiLayoutColumn(layout, 0);
 	
-	uiItemR(col, NULL, 0, ptr, "projector", UI_ITEM_R_TOGGLE);
+	uiItemR(col, NULL, 0, ptr, "projector", 0);
 	if (!nld->proj) {
-		row= uiLayoutRow(col, 0);
-		uiItemR(row, NULL, 0, ptr, "jitter", UI_ITEM_R_TOGGLE);
-		uiItemR(row, NULL, 0, ptr, "fit", UI_ITEM_R_TOGGLE);
+		col = uiLayoutColumn(col, 0);
+		uiItemR(col, NULL, 0, ptr, "jitter", 0);
+		uiItemR(col, NULL, 0, ptr, "fit", 0);
 	}
+//	uiLayoutSetActive(col, RNA_boolean_get(&imaptr, "projector"));
 }
 
 
@@ -1431,9 +1432,13 @@ static void node_composit_buts_vecblur(uiLayout *layout, PointerRNA *ptr)
 	
 	col= uiLayoutColumn(layout, 1);
 	uiItemR(col, NULL, 0, ptr, "samples", 0);
-	uiItemR(col, NULL, 0, ptr, "min_speed", 0);
-	uiItemR(col, NULL, 0, ptr, "max_speed", 0);
 	uiItemR(col, "Blur", 0, ptr, "factor", 0);
+	
+	col= uiLayoutColumn(layout, 1);
+	uiItemL(col, "Speed:", 0);
+	uiItemR(col, "Min", 0, ptr, "min_speed", 0);
+	uiItemR(col, "Max", 0, ptr, "max_speed", 0);
+	
 
 	col= uiLayoutColumn(layout, 0);
 	uiItemR(col, NULL, 0, ptr, "curved", 0);
@@ -1455,15 +1460,13 @@ static void node_composit_buts_crop(uiLayout *layout, PointerRNA *ptr)
 	
 	col= uiLayoutColumn(layout, 1);
 	
-	uiItemR(col, NULL, 0, ptr, "crop_size", UI_ITEM_R_TOGGLE);
-	
-	row= uiLayoutRow(col, 0);
-	uiItemR(row, NULL, 0, ptr, "x1", 0);
-	uiItemR(row, NULL, 0, ptr, "y1", 0);
+	uiItemR(col, NULL, 0, ptr, "crop_size", 0);
 	
-	row= uiLayoutRow(col, 0);
-	uiItemR(row, NULL, 0, ptr, "x2", 0);
-	uiItemR(row, NULL, 0, ptr, "y2", 0);
+	col= uiLayoutColumn(layout, 1);
+	uiItemR(row, "Left", 0, ptr, "x1", 0);
+	uiItemR(row, "Right", 0, ptr, "x2", 0);
+	uiItemR(row, "Up", 0, ptr, "y1", 0);
+	uiItemR(row, "Down", 0, ptr, "y2", 0);
 }
 
 static void node_composit_buts_splitviewer(uiLayout *layout, PointerRNA *ptr)
diff --git a/source/blender/makesrna/intern/rna_image.c b/source/blender/makesrna/intern/rna_image.c
index 8614e6f4ef3..13ec9aea9bb 100644
--- a/source/blender/makesrna/intern/rna_image.c
+++ b/source/blender/makesrna/intern/rna_image.c
@@ -211,7 +211,7 @@ static void rna_def_image(BlenderRNA *brna)
 		{0, NULL, 0, NULL, NULL}};
 	static const EnumPropertyItem prop_generated_type_items[]= {
 		{0, "BLANK", 0, "Blank", "Generate a blank image"},
-		{1, "UVTESTGRID", 0, "UV Test Grid", "Generated grid to test UV mappings"},
+		{1, "UVGRID", 0, "UV Grid", "Generated grid to test UV mappings"},
 		{0, NULL, 0, NULL, NULL}};
 	static const EnumPropertyItem prop_mapping_items[]= {
 		{0, "UV", 0, "UV Coordinates", "Use UV coordinates for mapping the image"},