[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [57362] trunk/blender: Fix cycles backwards compatibility for specular_toon shader this actually needs

Brecht Van Lommel brechtvanlommel at pandora.be
Mon Jun 10 22:10:03 CEST 2013


Revision: 57362
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=57362
Author:   blendix
Date:     2013-06-10 20:10:03 +0000 (Mon, 10 Jun 2013)
Log Message:
-----------
Fix cycles backwards compatibility for specular_toon shader this actually needs
to be done in cycles itself to keep compatibility for bytecode too.

Also fix broken button to compile OSL from the text editors, this got broken after
recent change to disable editing of library linked nodes.

Modified Paths:
--------------
    trunk/blender/intern/cycles/kernel/osl/osl_closures.cpp
    trunk/blender/intern/cycles/kernel/shaders/stdosl.h
    trunk/blender/source/blender/editors/space_node/node_edit.c

Modified: trunk/blender/intern/cycles/kernel/osl/osl_closures.cpp
===================================================================
--- trunk/blender/intern/cycles/kernel/osl/osl_closures.cpp	2013-06-10 19:01:40 UTC (rev 57361)
+++ trunk/blender/intern/cycles/kernel/osl/osl_closures.cpp	2013-06-10 20:10:03 UTC (rev 57362)
@@ -198,6 +198,8 @@
 		bsdf_diffuse_toon_params(), bsdf_diffuse_toon_prepare);
 	register_closure(ss, "glossy_toon", id++,
 		bsdf_glossy_toon_params(), bsdf_glossy_toon_prepare);
+	register_closure(ss, "specular_toon", id++,
+		bsdf_glossy_toon_params(), bsdf_glossy_toon_prepare);
 	register_closure(ss, "westin_backscatter", id++,
 		bsdf_westin_backscatter_params(), bsdf_westin_backscatter_prepare);
 	register_closure(ss, "westin_sheen", id++,

Modified: trunk/blender/intern/cycles/kernel/shaders/stdosl.h
===================================================================
--- trunk/blender/intern/cycles/kernel/shaders/stdosl.h	2013-06-10 19:01:40 UTC (rev 57361)
+++ trunk/blender/intern/cycles/kernel/shaders/stdosl.h	2013-06-10 20:10:03 UTC (rev 57362)
@@ -467,10 +467,7 @@
 
 // Backwards compatibility
 
-closure color specular_toon(normal N, float size, float smooth)
-{
-	return glossy_toon(N, size, smooth);
-}
+closure color specular_toon(normal N, float size, float smooth) BUILTIN;
 
 // Renderer state
 int raytype (string typename) BUILTIN;

Modified: trunk/blender/source/blender/editors/space_node/node_edit.c
===================================================================
--- trunk/blender/source/blender/editors/space_node/node_edit.c	2013-06-10 19:01:40 UTC (rev 57361)
+++ trunk/blender/source/blender/editors/space_node/node_edit.c	2013-06-10 20:10:03 UTC (rev 57362)
@@ -2315,9 +2315,6 @@
 	bNode *node;
 	Text *text;
 
-	if (!ED_operator_node_editable(C))
-		return 0;
-
 	/* test if we have a render engine that supports shaders scripts */
 	if (!(type && type->update_script_node))
 		return 0;
@@ -2325,14 +2322,14 @@
 	/* see if we have a shader script node in context */
 	node = CTX_data_pointer_get_type(C, "node", &RNA_ShaderNodeScript).data;
 
-	if (!node)
+	if (!node && snode && snode->edittree)
 		node = nodeGetActive(snode->edittree);
 
 	if (node && node->type == SH_NODE_SCRIPT) {
 		NodeShaderScript *nss = node->storage;
 
 		if (node->id || nss->filepath[0]) {
-			return 1;
+			return ED_operator_node_editable(C);
 		}
 	}
 




More information about the Bf-blender-cvs mailing list