[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [36535] branches/particles-2010/source: Fixed some build file problems and smaller issues.
Lukas Toenne
lukas.toenne at googlemail.com
Sat May 7 15:01:48 CEST 2011
Revision: 36535
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=36535
Author: lukastoenne
Date: 2011-05-07 13:01:48 +0000 (Sat, 07 May 2011)
Log Message:
-----------
Fixed some build file problems and smaller issues.
Modified Paths:
--------------
branches/particles-2010/source/blender/blenloader/CMakeLists.txt
branches/particles-2010/source/blender/blenloader/SConscript
branches/particles-2010/source/blender/editors/include/ED_node.h
branches/particles-2010/source/blender/editors/space_node/drawnode.c
branches/particles-2010/source/blender/makesrna/intern/CMakeLists.txt
branches/particles-2010/source/blender/makesrna/intern/SConscript
branches/particles-2010/source/blender/makesrna/intern/rna_nodetree.c
branches/particles-2010/source/blender/windowmanager/intern/wm_init_exit.c
branches/particles-2010/source/creator/CMakeLists.txt
Modified: branches/particles-2010/source/blender/blenloader/CMakeLists.txt
===================================================================
--- branches/particles-2010/source/blender/blenloader/CMakeLists.txt 2011-05-07 12:43:42 UTC (rev 36534)
+++ branches/particles-2010/source/blender/blenloader/CMakeLists.txt 2011-05-07 13:01:48 UTC (rev 36535)
@@ -31,7 +31,6 @@
../makesdna
../readblenfile
../makesrna
- ../nodes
../render/extern/include
../../../intern/guardedalloc
${ZLIB_INCLUDE_DIRS}
Modified: branches/particles-2010/source/blender/blenloader/SConscript
===================================================================
--- branches/particles-2010/source/blender/blenloader/SConscript 2011-05-07 12:43:42 UTC (rev 36534)
+++ branches/particles-2010/source/blender/blenloader/SConscript 2011-05-07 13:01:48 UTC (rev 36535)
@@ -5,7 +5,7 @@
incs = '. #/intern/guardedalloc ../blenlib ../blenkernel'
incs += ' ../makesdna ../readblenfile ../editors/include'
-incs += ' ../render/extern/include ../makesrna ../nodes'
+incs += ' ../render/extern/include ../makesrna'
incs += ' ' + env['BF_ZLIB_INC']
Modified: branches/particles-2010/source/blender/editors/include/ED_node.h
===================================================================
--- branches/particles-2010/source/blender/editors/include/ED_node.h 2011-05-07 12:43:42 UTC (rev 36534)
+++ branches/particles-2010/source/blender/editors/include/ED_node.h 2011-05-07 13:01:48 UTC (rev 36535)
@@ -43,7 +43,6 @@
/* drawnode.c */
void ED_init_node_butfuncs(void);
-void ED_init_node_socket_buttonfuncs(void);
/* node_draw.c */
void ED_node_tree_update(struct SpaceNode *snode, struct Scene *scene);
Modified: branches/particles-2010/source/blender/editors/space_node/drawnode.c
===================================================================
--- branches/particles-2010/source/blender/editors/space_node/drawnode.c 2011-05-07 12:43:42 UTC (rev 36534)
+++ branches/particles-2010/source/blender/editors/space_node/drawnode.c 2011-05-07 13:01:48 UTC (rev 36535)
@@ -178,34 +178,6 @@
uiDefBut(block, LABEL, 0, name, x + 40, y+2, labelw, 15, NULL, 0, 0, 0, 0, "");
}
-void ED_init_node_socket_buttonfuncs(void)
-{
- bNodeSocketType *stype;
- int i;
-
- for (i=0; i < NUM_SOCKET_TYPES; ++i) {
- stype = ntreeGetSocketType(i);
- if (stype) {
- switch(stype->type) {
- case SOCK_VALUE:
- case SOCK_FLOAT:
- case SOCK_INT:
- case SOCK_BOOLEAN:
- stype->buttonfunc = node_socket_button_default;
- break;
- case SOCK_VECTOR:
- stype->buttonfunc = node_socket_button_components;
- break;
- case SOCK_RGBA:
- stype->buttonfunc = node_socket_button_color;
- break;
- default:
- stype->buttonfunc = NULL;
- }
- }
- }
-}
-
/* ****************** BASE DRAW FUNCTIONS FOR NEW OPERATOR NODES ***************** */
void node_draw_socket_new(bNodeSocket *sock, float size)
@@ -1968,8 +1940,10 @@
{
bNodeTreeType *treetype;
bNodeType *ntype;
+ bNodeSocketType *stype;
int i;
+ /* node type ui functions */
for (i=0; i < NUM_NTREE_TYPES; ++i) {
treetype = ntreeGetType(i);
if (treetype) {
@@ -1997,6 +1971,29 @@
}
}
}
+
+ /* socket type ui functions */
+ for (i=0; i < NUM_SOCKET_TYPES; ++i) {
+ stype = ntreeGetSocketType(i);
+ if (stype) {
+ switch(stype->type) {
+ case SOCK_VALUE:
+ case SOCK_FLOAT:
+ case SOCK_INT:
+ case SOCK_BOOLEAN:
+ stype->buttonfunc = node_socket_button_default;
+ break;
+ case SOCK_VECTOR:
+ stype->buttonfunc = node_socket_button_components;
+ break;
+ case SOCK_RGBA:
+ stype->buttonfunc = node_socket_button_color;
+ break;
+ default:
+ stype->buttonfunc = NULL;
+ }
+ }
+ }
}
/* ************** Generic drawing ************** */
Modified: branches/particles-2010/source/blender/makesrna/intern/CMakeLists.txt
===================================================================
--- branches/particles-2010/source/blender/makesrna/intern/CMakeLists.txt 2011-05-07 12:43:42 UTC (rev 36534)
+++ branches/particles-2010/source/blender/makesrna/intern/CMakeLists.txt 2011-05-07 13:01:48 UTC (rev 36535)
@@ -218,7 +218,6 @@
../../makesdna
../../windowmanager
../../editors/include
- ../../nodes
../../render/extern/include
../../../../intern/audaspace/intern
../../../../intern/guardedalloc
Modified: branches/particles-2010/source/blender/makesrna/intern/SConscript
===================================================================
--- branches/particles-2010/source/blender/makesrna/intern/SConscript 2011-05-07 12:43:42 UTC (rev 36534)
+++ branches/particles-2010/source/blender/makesrna/intern/SConscript 2011-05-07 13:01:48 UTC (rev 36535)
@@ -32,7 +32,7 @@
incs = '#/intern/guardedalloc ../../blenlib ../../blenkernel ../../blenloader'
incs += ' ../../imbuf ../../makesdna ../../makesrna ../../ikplugin'
incs += ' ../../windowmanager ../../editors/include ../../blenfont'
-incs += ' ../../render/extern/include ../../nodes'
+incs += ' ../../render/extern/include'
incs += ' #/intern/audaspace/intern '
incs += ' #/extern/glew/include '
Modified: branches/particles-2010/source/blender/makesrna/intern/rna_nodetree.c
===================================================================
--- branches/particles-2010/source/blender/makesrna/intern/rna_nodetree.c 2011-05-07 12:43:42 UTC (rev 36534)
+++ branches/particles-2010/source/blender/makesrna/intern/rna_nodetree.c 2011-05-07 13:01:48 UTC (rev 36535)
@@ -57,8 +57,6 @@
#include "MEM_guardedalloc.h"
-#include "intern/node_socket.h"
-
static EnumPropertyItem dummy_items[] = {
{ 0, "PLACEHOLDER", 0, "Placeholder", ""},
{0, NULL, 0, NULL, NULL}
Modified: branches/particles-2010/source/blender/windowmanager/intern/wm_init_exit.c
===================================================================
--- branches/particles-2010/source/blender/windowmanager/intern/wm_init_exit.c 2011-05-07 12:43:42 UTC (rev 36534)
+++ branches/particles-2010/source/blender/windowmanager/intern/wm_init_exit.c 2011-05-07 13:01:48 UTC (rev 36535)
@@ -135,7 +135,6 @@
ED_file_init(); /* for fsmenu */
ED_init_node_butfuncs();
- ED_init_node_socket_buttonfuncs();
BLF_init(11, U.dpi); /* Please update source/gamengine/GamePlayer/GPG_ghost.cpp if you change this */
BLF_lang_init();
Modified: branches/particles-2010/source/creator/CMakeLists.txt
===================================================================
--- branches/particles-2010/source/creator/CMakeLists.txt 2011-05-07 12:43:42 UTC (rev 36534)
+++ branches/particles-2010/source/creator/CMakeLists.txt 2011-05-07 13:01:48 UTC (rev 36535)
@@ -747,7 +747,6 @@
bf_editor_metaball
bf_editor_object
bf_editor_physics
- bf_editor_particleset
bf_editor_render
bf_editor_screen
bf_editor_sculpt_paint
More information about the Bf-blender-cvs
mailing list