[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [31411] trunk/blender/source/blender/ makesrna/intern/rna_nodetree.c: 2.5 Nodes:

Thomas Dinges dingto at gmx.de
Tue Aug 17 11:59:55 CEST 2010


Revision: 31411
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=31411
Author:   dingto
Date:     2010-08-17 11:59:55 +0200 (Tue, 17 Aug 2010)

Log Message:
-----------
2.5 Nodes:
* Range Limit function for Image Output Frame Start/End properties. 

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

Modified: trunk/blender/source/blender/makesrna/intern/rna_nodetree.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_nodetree.c	2010-08-17 09:41:56 UTC (rev 31410)
+++ trunk/blender/source/blender/makesrna/intern/rna_nodetree.c	2010-08-17 09:59:55 UTC (rev 31411)
@@ -139,6 +139,24 @@
 	chroma->t2 = value;
 }
 
+static void rna_Image_start_frame_set(PointerRNA *ptr, int value)
+{
+	bNode *node= (bNode*)ptr->data;
+	NodeImageFile *image = node->storage;
+	
+	CLAMP(value, MINFRAME, image->efra); 
+	image->sfra= value;
+}
+
+static void rna_Image_end_frame_set(PointerRNA *ptr, int value)
+{
+	bNode *node= (bNode*)ptr->data;
+	NodeImageFile *image = node->storage;
+
+	CLAMP(value, image->sfra, MAXFRAME);
+	image->efra= value;
+}
+
 static void node_update(Main *bmain, Scene *scene, bNodeTree *ntree, bNode *node)
 {
 	ED_node_generic_update(bmain, scene, ntree, node);
@@ -1146,16 +1164,17 @@
 	RNA_def_property_range(prop, 1, 100);
 	RNA_def_property_ui_text(prop, "Quality", "");
 	RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update");
-	
-		// TODO: should these be limited to the extents of the each other so that no cross-over occurs?
+
 	prop = RNA_def_property(srna, "frame_start", PROP_INT, PROP_NONE);
 	RNA_def_property_int_sdna(prop, NULL, "sfra");
+	RNA_def_property_int_funcs(prop, NULL, "rna_Image_start_frame_set", NULL);
 	RNA_def_property_range(prop, MINFRAMEF, MAXFRAMEF);
 	RNA_def_property_ui_text(prop, "Start Frame", "");
 	RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update");
 	
 	prop = RNA_def_property(srna, "frame_end", PROP_INT, PROP_NONE);
 	RNA_def_property_int_sdna(prop, NULL, "efra");
+	RNA_def_property_int_funcs(prop, NULL, "rna_Image_end_frame_set", NULL);
 	RNA_def_property_range(prop, MINFRAMEF, MAXFRAMEF);
 	RNA_def_property_ui_text(prop, "End Frame", "");
 	RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update");





More information about the Bf-blender-cvs mailing list