[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [50260] trunk/blender/source/blender/nodes : texture curves were not initialized (causing crash), own regression from moving curve initialization outside evaluation.

[Campbell Barton]

Revision: 50260
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=50260
Author:   campbellbarton
Date:     2012-08-29 07:58:36 +0000 (Wed, 29 Aug 2012)
Log Message:
-----------
texture curves were not initialized (causing crash), own regression from moving curve initialization outside evaluation.

Modified Paths:
--------------
    trunk/blender/source/blender/nodes/intern/node_util.c
    trunk/blender/source/blender/nodes/intern/node_util.h
    trunk/blender/source/blender/nodes/shader/nodes/node_shader_curves.c
    trunk/blender/source/blender/nodes/texture/nodes/node_texture_curves.c

Modified: trunk/blender/source/blender/nodes/intern/node_util.c
===================================================================
--- trunk/blender/source/blender/nodes/intern/node_util.c	2012-08-29 07:07:18 UTC (rev 50259)
+++ trunk/blender/source/blender/nodes/intern/node_util.c	2012-08-29 07:58:36 UTC (rev 50260)
@@ -73,6 +73,12 @@
 	new_node->storage= MEM_dupallocN(orig_node->storage);
 }
 
+void *node_initexec_curves(bNode *node)
+{
+	curvemapping_initialize(node->storage);
+	return NULL;  /* unused return */
+}
+
 /**** Labels ****/
 
 const char *node_blend_label(bNode *node)

Modified: trunk/blender/source/blender/nodes/intern/node_util.h
===================================================================
--- trunk/blender/source/blender/nodes/intern/node_util.h	2012-08-29 07:07:18 UTC (rev 50259)
+++ trunk/blender/source/blender/nodes/intern/node_util.h	2012-08-29 07:58:36 UTC (rev 50260)
@@ -53,6 +53,7 @@
 
 extern void node_copy_curves(struct bNode *orig_node, struct bNode *new_node);
 extern void node_copy_standard_storage(struct bNode *orig_node, struct bNode *new_node);
+extern void *node_initexec_curves(struct bNode *node);
 
 /**** Labels ****/
 

Modified: trunk/blender/source/blender/nodes/shader/nodes/node_shader_curves.c
===================================================================
--- trunk/blender/source/blender/nodes/shader/nodes/node_shader_curves.c	2012-08-29 07:07:18 UTC (rev 50259)
+++ trunk/blender/source/blender/nodes/shader/nodes/node_shader_curves.c	2012-08-29 07:58:36 UTC (rev 50260)
@@ -45,12 +45,6 @@
 	{	-1, 0, ""	}
 };
 
-static void *node_shader_initexec_curve(bNode *node)
-{
-	curvemapping_initialize(node->storage);
-	return NULL;  /* unused return */
-}
-
 static void node_shader_exec_curve_vec(void *UNUSED(data), bNode *node, bNodeStack **in, bNodeStack **out)
 {
 	float vec[3];
@@ -86,7 +80,7 @@
 	node_type_init(&ntype, node_shader_init_curve_vec);
 	node_type_storage(&ntype, "CurveMapping", node_free_curves, node_copy_curves);
 	node_type_exec(&ntype, node_shader_exec_curve_vec);
-	node_type_exec_new(&ntype, node_shader_initexec_curve, NULL, NULL);  /* only for its initexec func */
+	node_type_exec_new(&ntype, node_initexec_curves, NULL, NULL);  /* only for its initexec func */
 	node_type_gpu(&ntype, gpu_shader_curve_vec);
 
 	nodeRegisterType(ttype, &ntype);
@@ -144,7 +138,7 @@
 	node_type_init(&ntype, node_shader_init_curve_rgb);
 	node_type_storage(&ntype, "CurveMapping", node_free_curves, node_copy_curves);
 	node_type_exec(&ntype, node_shader_exec_curve_rgb);
-	node_type_exec_new(&ntype, node_shader_initexec_curve, NULL, NULL);  /* only for its initexec func */
+	node_type_exec_new(&ntype, node_initexec_curves, NULL, NULL);  /* only for its initexec func */
 	node_type_gpu(&ntype, gpu_shader_curve_rgb);
 
 	nodeRegisterType(ttype, &ntype);

Modified: trunk/blender/source/blender/nodes/texture/nodes/node_texture_curves.c
===================================================================
--- trunk/blender/source/blender/nodes/texture/nodes/node_texture_curves.c	2012-08-29 07:07:18 UTC (rev 50259)
+++ trunk/blender/source/blender/nodes/texture/nodes/node_texture_curves.c	2012-08-29 07:58:36 UTC (rev 50260)
@@ -77,6 +77,7 @@
 	node_type_init(&ntype, time_init);
 	node_type_storage(&ntype, "CurveMapping", node_free_curves, node_copy_curves);
 	node_type_exec(&ntype, time_exec);
+	node_type_exec_new(&ntype, node_initexec_curves, NULL, NULL);  /* only for its initexec func */
 	
 	nodeRegisterType(ttype, &ntype);
 }
@@ -121,6 +122,7 @@
 	node_type_init(&ntype, rgb_init);
 	node_type_storage(&ntype, "CurveMapping", node_free_curves, node_copy_curves);
 	node_type_exec(&ntype, rgb_exec);
+	node_type_exec_new(&ntype, node_initexec_curves, NULL, NULL);  /* only for its initexec func */
 	
 	nodeRegisterType(ttype, &ntype);
 }