Revision: 30625
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=30625
Author: lukastoenne
Date: 2010-07-22 12:44:36 +0200 (Thu, 22 Jul 2010)
Log Message:
-----------
Added missing directories to scons build files
Modified Paths:
--------------
branches/particles-2010/source/blender/editors/SConscript
branches/particles-2010/source/blender/makesdna/DNA_node_types.h
branches/particles-2010/source/blender/nodes/SConscript
Added Paths:
-----------
branches/particles-2010/source/blender/editors/particleset/SConscript
Modified: branches/particles-2010/source/blender/editors/SConscript
===================================================================
--- branches/particles-2010/source/blender/editors/SConscript 2010-07-22
10:07:21 UTC (rev 30624)
+++ branches/particles-2010/source/blender/editors/SConscript 2010-07-22
10:44:36 UTC (rev 30625)
@@ -37,4 +37,5 @@
'transform/SConscript',
'screen/SConscript',
'sculpt_paint/SConscript',
- 'uvedit/SConscript'])
+ 'uvedit/SConscript',
+ 'particleset/SConscript'])
Added: branches/particles-2010/source/blender/editors/particleset/SConscript
===================================================================
--- branches/particles-2010/source/blender/editors/particleset/SConscript
(rev 0)
+++ branches/particles-2010/source/blender/editors/particleset/SConscript
2010-07-22 10:44:36 UTC (rev 30625)
@@ -0,0 +1,25 @@
+#!/usr/bin/python
+Import ('env')
+
+sources = env.Glob('*.c')
+
+incs = '../include ../../blenlib ../../blenkernel ../../makesdna ../../imbuf'
+incs += ' ../../windowmanager #/intern/guardedalloc #/extern/glew/include'
+incs += ' ../../gpu'
+incs += ' ../../makesrna ../../render/extern/include #/intern/elbeem/extern'
+
+defs = ''
+
+if env['OURPLATFORM'] == 'linux2':
+ cflags='-pthread'
+ incs += ' ../../../extern/binreloc/include'
+
+if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc'):
+ incs += ' ' + env['BF_PTHREADS_INC']
+
+
+if env['OURPLATFORM'] == 'darwin':
+ if env['WITH_BF_OPENMP']:
+ defs += ' PARALLEL=1'
+
+env.BlenderLib ( 'bf_editors_particleset', sources, Split(incs), Split(defs),
libtype=['core'], priority=[45] )
Modified: branches/particles-2010/source/blender/makesdna/DNA_node_types.h
===================================================================
--- branches/particles-2010/source/blender/makesdna/DNA_node_types.h
2010-07-22 10:07:21 UTC (rev 30624)
+++ branches/particles-2010/source/blender/makesdna/DNA_node_types.h
2010-07-22 10:44:36 UTC (rev 30625)
@@ -56,6 +56,20 @@
struct bNodeStack *stack;
} bNodeOperatorContext;
+/* Every socket has a context, which describes the 'domain' of its data.
+ * Only sockets with a matching context can be connected to each other.
+ */
+typedef struct bNodeDataCollection {
+} bNodeDataCollection;
+
+typedef enum NodeDataCollectionType {
+ NDC_SINGLETON = 0,
+ NDC_PARTICLE,
+ NDC_MESH_VERTEX,
+ NDC_MESH_EDGE,
+ NDC_MESH_FACE
+} NodeDataCollectionType;
+
typedef struct bNodeStack {
float vec[4];
float min, max; /* min/max for values (UI writes it,
execute might use it) */
Modified: branches/particles-2010/source/blender/nodes/SConscript
===================================================================
--- branches/particles-2010/source/blender/nodes/SConscript 2010-07-22
10:07:21 UTC (rev 30624)
+++ branches/particles-2010/source/blender/nodes/SConscript 2010-07-22
10:44:36 UTC (rev 30625)
@@ -5,6 +5,7 @@
cmpsources = env.Glob('intern/CMP_nodes/*.c')
shdsources = env.Glob('intern/SHD_nodes/*.c')
texsources = env.Glob('intern/TEX_nodes/*.c')
+simsources = env.Glob('intern/SIM_nodes/*.c')
incs = '. ./intern '
incs += '#/intern/guardedalloc ../editors/include ../blenlib ../makesdna'
@@ -38,3 +39,4 @@
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] )
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
