[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [24148] trunk/blender/source/blender: 2. 5 Nodes:

[Thomas Dinges]

Revision: 24148
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=24148
Author:   dingto
Date:     2009-10-28 23:14:31 +0100 (Wed, 28 Oct 2009)

Log Message:
-----------
2.5 Nodes:
* Wraped Texture Nodes: Output and Bricks.
* Show Quality Slider (Composite > File Output) only for JPEG. 

Modified Paths:
--------------
    trunk/blender/source/blender/editors/space_node/drawnode.c
    trunk/blender/source/blender/makesrna/intern/rna_nodetree.c

Modified: trunk/blender/source/blender/editors/space_node/drawnode.c
===================================================================
--- trunk/blender/source/blender/editors/space_node/drawnode.c	2009-10-28 20:54:20 UTC (rev 24147)
+++ trunk/blender/source/blender/editors/space_node/drawnode.c	2009-10-28 22:14:31 UTC (rev 24148)
@@ -1496,8 +1496,8 @@
 		uiItemR(row, NULL, 0, ptr, "exr_half", 0);
 		uiItemR(row, "", 0, ptr, "exr_codec", 0);
 	}
-	else {
-		uiItemR(row, NULL, 0, ptr, "quality", 0);
+	else if (RNA_enum_get(ptr, "image_type")== R_JPEG90) {
+		uiItemR(row, NULL, 0, ptr, "quality", UI_ITEM_R_SLIDER);
 	}
 	
 	row= uiLayoutRow(layout, 1);
@@ -1698,43 +1698,15 @@
 
 static void node_texture_buts_bricks(uiLayout *layout, PointerRNA *ptr)
 {
-	uiBlock *block= uiLayoutAbsoluteBlock(layout);
-	bNode *node= ptr->data;
-	rctf *butr= &node->butr;
-	short w = butr->xmax-butr->xmin;
-	short ofw = 32;
+	uiLayout *col;
 	
-	uiBlockBeginAlign(block);
+	col= uiLayoutColumn(layout, 1);
+	uiItemR(col, "Offset", 0, ptr, "offset", 0);
+	uiItemR(col, "Frequency", 0, ptr, "offset_frequency", 0);
 	
-	/* Offset */
-	uiDefButF(
-		block, NUM, B_NODE_EXEC, "Offset",
-		butr->xmin, butr->ymin+20, w-ofw, 20,
-		&node->custom3,
-		0, 1, 0.25, 2,
-		"Offset amount" );
-	uiDefButS(
-		block, NUM, B_NODE_EXEC, "",
-		butr->xmin+w-ofw, butr->ymin+20, ofw, 20,
-		&node->custom1,
-		2, 99, 0, 0,
-		"Offset every N rows" );
-	
-	/* Squash */
-	uiDefButF(
-		block, NUM, B_NODE_EXEC, "Squash",
-		butr->xmin, butr->ymin+0, w-ofw, 20,
-		&node->custom4,
-		0, 99, 0.25, 2,
-		"Stretch amount" );
-	uiDefButS(
-		block, NUM, B_NODE_EXEC, "",
-		butr->xmin+w-ofw, butr->ymin+0, ofw, 20,
-		&node->custom2,
-		2, 99, 0, 0,
-		"Stretch every N rows" );
-	
-	uiBlockEndAlign(block);
+	col= uiLayoutColumn(layout, 1);
+	uiItemR(col, "Squash", 0, ptr, "squash", 0);
+	uiItemR(col, "Frequency", 0, ptr, "squash_frequency", 0);
 }
 
 /* Copied from buttons_shading.c -- needs unifying */
@@ -1865,28 +1837,7 @@
 
 static void node_texture_buts_output(uiLayout *layout, PointerRNA *ptr)
 {
-	uiBlock *block= uiLayoutAbsoluteBlock(layout);
-	bNode *node= ptr->data;
-	rctf *butr= &node->butr;
-	uiBut *bt;
-	short width;
-	char *name = ((TexNodeOutput*)node->storage)->name;
-	
-	uiBlockBeginAlign(block);
-	
-	width = (short)(butr->xmax - butr->xmin);
-	
-	bt = uiDefBut(
-		block, TEX, B_NOP,
-		"Name:",
-		butr->xmin, butr->ymin,
-		width, 19, 
-		name, 0, 31,
-		0, 0, 
-		"Name this output"
-	);
-	
-	uiBlockEndAlign(block);
+	uiItemR(layout, "", 0, ptr, "output_name", 0);
 }
 
 /* only once called */

Modified: trunk/blender/source/blender/makesrna/intern/rna_nodetree.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_nodetree.c	2009-10-28 20:54:20 UTC (rev 24147)
+++ trunk/blender/source/blender/makesrna/intern/rna_nodetree.c	2009-10-28 22:14:31 UTC (rev 24148)
@@ -914,6 +914,7 @@
 	
 	prop = RNA_def_property(srna, "quality", PROP_INT, PROP_NONE);
 	RNA_def_property_int_sdna(prop, NULL, "quality");
+	RNA_def_property_range(prop, 1, 100);
 	RNA_def_property_ui_text(prop, "Quality", "");
 	
 	prop = RNA_def_property(srna, "start_frame", PROP_INT, PROP_NONE);