[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [34782] branches/particles-2010/source/ blender: Added missing files to svn and fixed scons build files.

Lukas Toenne lukas.toenne at googlemail.com
Fri Feb 11 19:23:01 CET 2011 

Revision: 34782
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=34782
Author:   lukastoenne
Date:     2011-02-11 18:23:00 +0000 (Fri, 11 Feb 2011)
Log Message:
-----------
Added missing files to svn and fixed scons build files.

Modified Paths:
--------------
    branches/particles-2010/source/blender/blenkernel/BKE_node.h
    branches/particles-2010/source/blender/nodes/SConscript

Added Paths:
-----------
    branches/particles-2010/source/blender/nodes/PAR_node.h
    branches/particles-2010/source/blender/nodes/intern/PAR_nodes/
    branches/particles-2010/source/blender/nodes/intern/PAR_nodetree.c

Modified: branches/particles-2010/source/blender/blenkernel/BKE_node.h
===================================================================
--- branches/particles-2010/source/blender/blenkernel/BKE_node.h	2011-02-11 17:56:25 UTC (rev 34781)
+++ branches/particles-2010/source/blender/blenkernel/BKE_node.h	2011-02-11 18:23:00 UTC (rev 34782)
@@ -107,8 +107,13 @@
 	/* this line is set on startup of blender */
 	/* node options ui */
 	void (*uifunc)(struct uiLayout *, struct bContext *C, struct PointerRNA *ptr);
+	/* detail buttons on panel */
+	void (*buttonfunc)(struct uiLayout *, struct bContext *C, struct PointerRNA *ptr);
 	const char *(*labelfunc)(struct bNode *);
 
+	/* called when the node is updated (e.g. linked) in the editor. */
+	void (*updatefunc)(struct bNodeTree *ntree, struct bNode *node);
+
 	void (*initfunc)(struct bNode *);
 	void (*freestoragefunc)(struct bNode *);
 	void (*copystoragefunc)(struct bNode *, struct bNode *);
@@ -120,12 +125,6 @@
 
 	/* gpu */
 	int (*gpufunc)(struct GPUMaterial *mat, struct bNode *node, struct GPUNodeStack *in, struct GPUNodeStack *out);
-
-	/* node buttons ui */
-	void (*buttonfunc)(struct uiLayout *, struct bContext *C, struct PointerRNA *ptr);
-
-	/* called when the node is updated (e.g. linked) in the editor. */
-	void (*updatefunc)(struct bNodeTree *ntree, struct bNode *node);
 } bNodeType;
 
 /* node->exec, now in use for composites (#define for break is same as ready yes) */

Added: branches/particles-2010/source/blender/nodes/PAR_node.h
===================================================================
--- branches/particles-2010/source/blender/nodes/PAR_node.h	                        (rev 0)
+++ branches/particles-2010/source/blender/nodes/PAR_node.h	2011-02-11 18:23:00 UTC (rev 34782)
@@ -0,0 +1,39 @@
+/**
+ *
+ * ***** BEGIN GPL LICENSE BLOCK *****
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version. The Blender
+ * Foundation also sells licenses for use in proprietary software under
+ * the Blender License.  See http://www.blender.org/BL/ for information
+ * about this.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * The Original Code is Copyright (C) 2005 Blender Foundation.
+ * All rights reserved.
+ *
+ * The Original Code is: all of this file.
+ *
+ * Contributor(s): none yet.
+ *
+ * ***** END GPL LICENSE BLOCK *****
+ */
+
+#ifndef PAR_NODE_H
+#define PAR_NODE_H
+
+#include "BKE_node.h"
+
+extern bNodeTreeType ntreeType_Particle;
+
+#endif

Modified: branches/particles-2010/source/blender/nodes/SConscript
===================================================================
--- branches/particles-2010/source/blender/nodes/SConscript	2011-02-11 17:56:25 UTC (rev 34781)
+++ branches/particles-2010/source/blender/nodes/SConscript	2011-02-11 18:23:00 UTC (rev 34782)
@@ -2,11 +2,11 @@
 Import ('env')
 
 sources = env.Glob('intern/*.c')
-cmpsources = env.Glob('intern/CMP_nodes/*.c') + env.Glob('intern/CMP_nodes/nodes/*.c')
-shdsources = env.Glob('intern/SHD_nodes/*.c') + env.Glob('intern/SHD_nodes/nodes/*.c')
-texsources = env.Glob('intern/TEX_nodes/*.c') + env.Glob('intern/TEX_nodes/nodes/*.c')
-simsources = env.Glob('intern/SIM_nodes/*.c') + env.Glob('intern/SIM_nodes/nodes/*.c')
-modsources = env.Glob('intern/MOD_nodes/*.c') + env.Glob('intern/MOD_nodes/nodes/*.c')
+cmpsources = env.Glob('intern/CMP_nodes/*.c')
+shdsources = env.Glob('intern/SHD_nodes/*.c')
+texsources = env.Glob('intern/TEX_nodes/*.c')
+modsources = env.Glob('intern/MOD_nodes/*.c')
+#parsources = env.Glob('intern/PAR_nodes/*.c')
 incs = '. ./intern '
 incs += '#/intern/guardedalloc ../editors/include ../blenlib ../makesdna'
 incs += ' ../render/extern/include ../makesrna '
@@ -38,5 +38,5 @@
 env.BlenderLib ( libname = 'bf_cmpnodes', sources = cmpsources, includes = Split(incs), defines = defs, libtype=['core','player'], priority = [175,101] )
 env.BlenderLib ( libname = 'bf_shdnodes', sources = shdsources, includes = Split(incs), defines = defs, libtype=['core','player'], priority = [175,101] )
 env.BlenderLib ( libname = 'bf_texnodes', sources = texsources, includes = Split(incs), defines = defs, libtype=['core','player'], priority = [175,101] )
-env.BlenderLib ( libname = 'bf_simnodes', sources = simsources, includes = Split(incs), defines = defs, libtype=['core','player'], priority = [175,101] )
 env.BlenderLib ( libname = 'bf_modnodes', sources = modsources, includes = Split(incs), defines = defs, libtype=['core','player'], priority = [175,101] )
+#env.BlenderLib ( libname = 'bf_parnodes', sources = parsources, includes = Split(incs), defines = defs, libtype=['core','player'], priority = [175,101] )

Added: branches/particles-2010/source/blender/nodes/intern/PAR_nodetree.c
===================================================================
--- branches/particles-2010/source/blender/nodes/intern/PAR_nodetree.c	                        (rev 0)
+++ branches/particles-2010/source/blender/nodes/intern/PAR_nodetree.c	2011-02-11 18:23:00 UTC (rev 34782)
@@ -0,0 +1,88 @@
+/**
+ * ***** BEGIN GPL LICENSE BLOCK *****
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version. 
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * The Original Code is Copyright (C) 2007 Blender Foundation.
+ * All rights reserved.
+ *
+ * The Original Code is: all of this file.
+ *
+ * Contributor(s):
+ *
+ * ***** END GPL LICENSE BLOCK *****
+ */
+
+#include <assert.h>
+
+#include "DNA_node_types.h"
+#include "DNA_object_types.h"
+#include "DNA_particle_types.h"
+#include "DNA_scene_types.h"
+
+#include "BLI_listbase.h"
+#include "BLI_utildefines.h"
+
+#include "BKE_global.h"
+#include "BKE_main.h"
+#include "BKE_node.h"
+
+#include "node_exec.h"
+#include "node_util.h"
+
+#include "PAR_node.h"
+
+#include "MEM_guardedalloc.h"
+
+static void foreachNodeTree(Main *main, void *calldata, bNodeTreeCallback func)
+{
+	bNodeTree *ntree;
+	for(ntree= main->nodetree.first; ntree; ntree= ntree->id.next) {
+		if (ntree->type==NTREE_PARTICLE)
+			func(calldata, &ntree->id, ntree);
+	}
+}
+
+static void exec(bNodeTreeExec *UNUSED(execdata), void *UNUSED(callerdata), int UNUSED(thread))
+{
+}
+
+bNodeTreeType ntreeType_Particle = {
+	/* type */				NTREE_PARTICLE,
+	/* id_name */			"NTParticle Nodetree",
+	
+	/* node_types */		{ NULL, NULL },
+	
+	/* freeCache */			NULL,
+	/* freeNodeCache */		NULL,
+	/* foreachNodeTree */	foreachNodeTree,
+	/* beginExec */			ntree_begin_exec,
+	/* endExec */			ntree_end_exec,
+	/* exec */				exec,
+	/* update */			ntree_update,
+	/* updateNode */		ntree_update_node,
+	/* verifyLink */		ntree_verify_link
+};
+
+void ntreeParticleExecTree(bNodeTree *ntree, Scene *UNUSED(scene), Object *UNUSED(ob), ParticleSystem *UNUSED(psys))
+{
+	bNodeTreeExec *exec;
+	
+	exec = ntreeBeginExecTree(ntree);
+	ntreeExecTree(exec, NULL, 0);
+	ntreeEndExecTree(exec);
+}
+
+#undef DEBUGPRINT

More information about the Bf-blender-cvs mailing list