[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [52051] trunk/blender/source/blender/ makesrna/intern/rna_nodetree.c: Cycles OSL: auto update script node sockets when setting text datablock or filepath.

[Brecht Van Lommel]

Revision: 52051
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=52051
Author:   blendix
Date:     2012-11-09 22:08:51 +0000 (Fri, 09 Nov 2012)
Log Message:
-----------
Cycles OSL: auto update script node sockets when setting text datablock or filepath.

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	2012-11-09 22:01:37 UTC (rev 52050)
+++ trunk/blender/source/blender/makesrna/intern/rna_nodetree.c	2012-11-09 22:08:51 UTC (rev 52051)
@@ -220,6 +220,7 @@
 
 #include "ED_node.h"
 
+#include "RE_engine.h"
 #include "RE_pipeline.h"
 
 #include "DNA_scene_types.h"
@@ -1133,6 +1134,22 @@
 	return nss->prop;
 }
 
+static void rna_ShaderNodeScript_update(Main *bmain, Scene *scene, PointerRNA *ptr)
+{
+	bNodeTree *ntree = (bNodeTree *)ptr->id.data;
+	bNode *node = (bNode *)ptr->data;
+	RenderEngineType *engine_type = RE_engines_find(scene->r.engine);
+
+	if(engine_type && engine_type->update_script_node) {
+		/* auto update node */
+		RenderEngine *engine = RE_engine_create(engine_type);
+		engine_type->update_script_node(engine, ntree, node);
+		RE_engine_free(engine);
+	}
+
+	node_update(bmain, scene, ntree, node);
+}
+
 #else
 
 static EnumPropertyItem prop_image_layer_items[] = {
@@ -1930,14 +1947,14 @@
 	RNA_def_property_struct_type(prop, "Text");
 	RNA_def_property_flag(prop, PROP_EDITABLE | PROP_ID_REFCOUNT);
 	RNA_def_property_ui_text(prop, "Script", "Internal shader script to define the shader");
-	RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update");
+	RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_ShaderNodeScript_update");
 	
 	RNA_def_struct_sdna_from(srna, "NodeShaderScript", "storage");
 	RNA_def_struct_idprops_func(srna, "rna_ShaderNodeScript_idprops");
 	
 	prop = RNA_def_property(srna, "filepath", PROP_STRING, PROP_FILEPATH);
 	RNA_def_property_ui_text(prop, "File Path", "Shader script path");
-	RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update");
+	RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_ShaderNodeScript_update");
 
 	prop = RNA_def_property(srna, "mode", PROP_ENUM, PROP_NONE);
 	RNA_def_property_enum_funcs(prop, NULL, "rna_ShaderNodeScript_mode_set", NULL);