[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [36510] trunk/blender/source/blenderplayer /CMakeLists.txt: Patch #27225: blenderplayer resource compilation error fix for cmake + mingw,
Revision: 36510
http://projects.blender.org/scm/viewvc.php?view=revroot=bf-blenderrevision=36510
Author: blendix
Date: 2011-05-06 08:16:44 + (Fri, 06 May 2011)
Log Message:
---
Patch #27225: blenderplayer resource compilation error fix for cmake + mingw,
patch by Ryakiotakis Antonis.
Modified Paths:
--
trunk/blender/source/blenderplayer/CMakeLists.txt
Modified: trunk/blender/source/blenderplayer/CMakeLists.txt
===
--- trunk/blender/source/blenderplayer/CMakeLists.txt 2011-05-06 03:29:55 UTC
(rev 36509)
+++ trunk/blender/source/blenderplayer/CMakeLists.txt 2011-05-06 08:16:44 UTC
(rev 36510)
@@ -43,13 +43,25 @@
string(SUBSTRING ${BLENDER_VERSION} 0 1 bver1)
string(SUBSTRING ${BLENDER_VERSION} 2 1 bver2)
string(SUBSTRING ${BLENDER_VERSION} 3 1 bver3)
- add_definitions(
- -DBLEN_VER_RC_STR=${BLENDER_VERSION}
- -DBLEN_VER_RC_1=${bver1}
- -DBLEN_VER_RC_2=${bver2}
- -DBLEN_VER_RC_3=${bver3}
- -DBLEN_VER_RC_4=0
- )
+ if(MINGW)
+ add_definitions(
+ -DWINDRES
+ -DBLEN_VER_RC_STR_M=${BLENDER_VERSION}
+ -DBLEN_VER_RC_1=${bver1}
+ -DBLEN_VER_RC_2=${bver2}
+ -DBLEN_VER_RC_3=${bver3}
+ -DBLEN_VER_RC_4=0
+ )
+ else()
+ add_definitions(
+ -DBLEN_VER_RC_STR=${BLENDER_VERSION}
+ -DBLEN_VER_RC_1=${bver1}
+ -DBLEN_VER_RC_2=${bver2}
+ -DBLEN_VER_RC_3=${bver3}
+ -DBLEN_VER_RC_4=0
+ )
+ endif()
+
add_executable(blenderplayer ${EXETYPE}
${CMAKE_CURRENT_BINARY_DIR}/dna.c ../icons/winblender.rc)
else()
add_executable(blenderplayer ${CMAKE_CURRENT_BINARY_DIR}/dna.c)
___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [36511] branches/cycles/source/blender/ makesrna/intern/rna_space.c: Cycles: fix missing #include.
Revision: 36511
http://projects.blender.org/scm/viewvc.php?view=revroot=bf-blenderrevision=36511
Author: blendix
Date: 2011-05-06 09:19:29 + (Fri, 06 May 2011)
Log Message:
---
Cycles: fix missing #include.
Modified Paths:
--
branches/cycles/source/blender/makesrna/intern/rna_space.c
Modified: branches/cycles/source/blender/makesrna/intern/rna_space.c
===
--- branches/cycles/source/blender/makesrna/intern/rna_space.c 2011-05-06
08:16:44 UTC (rev 36510)
+++ branches/cycles/source/blender/makesrna/intern/rna_space.c 2011-05-06
09:19:29 UTC (rev 36511)
@@ -48,6 +48,7 @@
#include WM_api.h
#include WM_types.h
+#include RE_engine.h
#include RE_pipeline.h
EnumPropertyItem space_type_items[] = {
___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [36512] branches/particles-2010/source/ blender: Another do_versions fix: Old node trees will now get an automatic update call, so that node dependenc
Revision: 36512
http://projects.blender.org/scm/viewvc.php?view=revroot=bf-blenderrevision=36512
Author: lukastoenne
Date: 2011-05-06 09:43:01 + (Fri, 06 May 2011)
Log Message:
---
Another do_versions fix: Old node trees will now get an automatic update call,
so that node dependency levels are correct and node links flagged valid.
Modified Paths:
--
branches/particles-2010/source/blender/blenkernel/intern/node.c
branches/particles-2010/source/blender/blenloader/intern/readfile.c
branches/particles-2010/source/blender/makesdna/DNA_node_types.h
Modified: branches/particles-2010/source/blender/blenkernel/intern/node.c
===
--- branches/particles-2010/source/blender/blenkernel/intern/node.c
2011-05-06 09:19:29 UTC (rev 36511)
+++ branches/particles-2010/source/blender/blenkernel/intern/node.c
2011-05-06 09:43:01 UTC (rev 36512)
@@ -1638,14 +1638,11 @@
for (link = ntree-links.first; link; link = link-next) {
link-flag |= NLINK_VALID;
- /* skip incomplete links (from modal linking operator) */
- if (link-fromsock link-tosock) {
- if (link-fromnode link-tonode
link-fromnode-level = link-tonode-level)
+ if (link-fromnode link-tonode link-fromnode-level =
link-tonode-level)
+ link-flag = ~NLINK_VALID;
+ else if (ntreetype-validate_link) {
+ if (!ntreetype-validate_link(ntree, link))
link-flag = ~NLINK_VALID;
- else if (ntreetype-validate_link) {
- if (!ntreetype-validate_link(ntree, link))
- link-flag = ~NLINK_VALID;
- }
}
}
}
Modified: branches/particles-2010/source/blender/blenloader/intern/readfile.c
===
--- branches/particles-2010/source/blender/blenloader/intern/readfile.c
2011-05-06 09:19:29 UTC (rev 36511)
+++ branches/particles-2010/source/blender/blenloader/intern/readfile.c
2011-05-06 09:43:01 UTC (rev 36512)
@@ -2058,7 +2058,7 @@
/* updates group node socket own_index so that
* external links to/from the group node are preserved.
*/
-static void lib_node_do_versions_group(bNode *gnode)
+static void lib_node_do_versions_group_indices(bNode *gnode)
{
bNodeTree *ngroup= (bNodeTree*)gnode-id;
bNode *intnode;
@@ -2091,19 +2091,26 @@
}
/* updates external links for all group nodes in a tree */
-static void lib_nodetree_do_versions_cb(void *UNUSED(data), ID *UNUSED(id),
bNodeTree *ntree)
+static void lib_nodetree_do_versions_group_indices_cb(void *UNUSED(data), ID
*UNUSED(id), bNodeTree *ntree)
{
bNode *node;
for (node=ntree-nodes.first; node; node=node-next) {
if (node-type==NODE_GROUP) {
bNodeTree *ngroup= (bNodeTree*)node-id;
- if (ngroup-flag NTREE_DO_VERSIONS)
- lib_node_do_versions_group(node);
+ if (ngroup-flag NTREE_DO_VERSIONS_GROUP_EXPOSE)
+ lib_node_do_versions_group_indices(node);
}
}
}
+/* make an update call for the tree */
+static void lib_nodetree_do_versions_update_cb(void *UNUSED(data), ID
*UNUSED(id), bNodeTree *ntree)
+{
+ if (ntree-update)
+ ntreeUpdateTree(ntree);
+}
+
/* verify types for nodes and groups, all data has to be read */
/* open = 0: appending/linking, open = 1: open new file (need to clean out
dynamic
* typedefs*/
@@ -2135,27 +2142,41 @@
* actual group node updates.
*/
for(ntree= main-nodetree.first; ntree; ntree= ntree-id.next) {
- if (ntree-flag NTREE_DO_VERSIONS) {
+ if (ntree-flag NTREE_DO_VERSIONS_GROUP_EXPOSE) {
/* this adds copies and links from all unlinked
internal sockets to group inputs/outputs. */
node_group_expose_all_sockets(ntree);
has_old_groups = 1;
}
}
- for (i=0; i NUM_NTREE_TYPES; ++i) {
- ntreetype= ntreeGetType(i);
- if (ntreetype ntreetype-foreachNodeTree)
- ntreetype-foreachNodeTree(main, NULL,
lib_nodetree_do_versions_cb);
+ if (has_old_groups) {
+ for (i=0; i NUM_NTREE_TYPES; ++i) {
+ ntreetype= ntreeGetType(i);
+ if (ntreetype ntreetype-foreachNodeTree)
+ ntreetype-foreachNodeTree(main, NULL,
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [36513] branches/particles-2010: Removed an older version of paged particles that was still sitting in there quietly .
Revision: 36513 http://projects.blender.org/scm/viewvc.php?view=revroot=bf-blenderrevision=36513 Author: lukastoenne Date: 2011-05-06 11:03:09 + (Fri, 06 May 2011) Log Message: --- Removed an older version of paged particles that was still sitting in there quietly. Removed several unwanted changes accumulated over time (mostly whitespace diffs). Modified Paths: -- branches/particles-2010/build_files/cmake/example_scripts/make_quicky.py branches/particles-2010/source/blender/blenkernel/BKE_main.h branches/particles-2010/source/blender/blenkernel/BKE_particle.h branches/particles-2010/source/blender/blenkernel/intern/library.c branches/particles-2010/source/blender/blenkernel/intern/particle.c branches/particles-2010/source/blender/blenkernel/intern/particle_system.c branches/particles-2010/source/blender/blenloader/intern/readfile.c branches/particles-2010/source/blender/blenloader/intern/writefile.c branches/particles-2010/source/blender/editors/space_view3d/drawobject.c branches/particles-2010/source/blender/makesdna/DNA_object_types.h branches/particles-2010/source/blender/makesdna/DNA_particle_types.h branches/particles-2010/source/blender/makesrna/RNA_access.h branches/particles-2010/source/blender/makesrna/intern/rna_modifier.c branches/particles-2010/source/blender/makesrna/intern/rna_particle.c branches/particles-2010/source/creator/creator.c Removed Paths: - branches/particles-2010/source/blender/editors/include/ED_particleset.h Modified: branches/particles-2010/build_files/cmake/example_scripts/make_quicky.py === --- branches/particles-2010/build_files/cmake/example_scripts/make_quicky.py 2011-05-06 09:43:01 UTC (rev 36512) +++ branches/particles-2010/build_files/cmake/example_scripts/make_quicky.py 2011-05-06 11:03:09 UTC (rev 36513) @@ -20,6 +20,7 @@ # pep8 compliant + def print_help(targets): print(CMake quicky wrapper, no valid targets given.) print( * targets can contain a subset of the full target name.) @@ -36,11 +37,11 @@ for t in targets: print(%s % t) print(...exiting) - + def main(): targets = set() - + # collect targets makefile = open(Makefile, r) for line in makefile: @@ -54,13 +55,12 @@ line = line.split(:, 1)[0] -if / in line: # cmake terget options, dont need these +if / in line: # cmake terget options, dont need these continue targets.add(line) makefile.close() - # remove cmake targets bad = set([ help, @@ -75,10 +75,9 @@ depend, cmake_check_build_system, ]) - + targets -= set(bad) - # parse args targets = list(targets) targets.sort() @@ -106,7 +105,7 @@ print(%s % t) print(...aborting.) return - + # execute cmd = make %s %s blender/fast % ( .join(args), .join(targets_new)) print(cmake building with targets: %s % .join(targets_new)) Modified: branches/particles-2010/source/blender/blenkernel/BKE_main.h === --- branches/particles-2010/source/blender/blenkernel/BKE_main.h 2011-05-06 09:43:01 UTC (rev 36512) +++ branches/particles-2010/source/blender/blenkernel/BKE_main.h 2011-05-06 11:03:09 UTC (rev 36513) @@ -86,7 +86,6 @@ ListBase particle; ListBase wm; ListBase gpencil; - ListBase particleset; char id_tag_update[256]; } Main; Modified: branches/particles-2010/source/blender/blenkernel/BKE_particle.h === --- branches/particles-2010/source/blender/blenkernel/BKE_particle.h 2011-05-06 09:43:01 UTC (rev 36512) +++ branches/particles-2010/source/blender/blenkernel/BKE_particle.h 2011-05-06 11:03:09 UTC (rev 36513) @@ -300,48 +300,6 @@ void psys_check_boid_data(struct ParticleSystem *psys); -/ particles-2010 / -/* particle property management */ -struct ParticleProperty *psys_find_particle_property(struct ParticleSystem *psys, const char *name); - -struct ParticleProperty *psys_property_add(struct ParticleSystem *psys, const char *name, ParticlePropertyType type, int flags); -int psys_property_remove(struct ParticleSystem *psys, int index); -int psys_property_moveup(struct ParticleSystem *psys, int index); -int psys_property_movedown(struct ParticleSystem *psys, int index); - -/* buffer management */ -void psys_create_particles(struct ParticleSystem *psys, float cfra, int emit); -void psys_kill_particle(struct ParticleSystem *psys, int index); -void psys_kill_all_particles(struct ParticleSystem *psys); -void free_page(struct ParticleSystem *psys, struct ParticlePage *page); -void
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [36514] trunk/blender/release/scripts/ modules/bpy/path.py: patch [#27205] Infinite recursion inside resolve_ncase () when passed a driver letter on W
Revision: 36514 http://projects.blender.org/scm/viewvc.php?view=revroot=bf-blenderrevision=36514 Author: campbellbarton Date: 2011-05-06 11:27:04 + (Fri, 06 May 2011) Log Message: --- patch [#27205] Infinite recursion inside resolve_ncase() when passed a driver letter on Windows that does not exist by Brandon Ehle (azverkan) Modified Paths: -- trunk/blender/release/scripts/modules/bpy/path.py Modified: trunk/blender/release/scripts/modules/bpy/path.py === --- trunk/blender/release/scripts/modules/bpy/path.py 2011-05-06 11:03:09 UTC (rev 36513) +++ trunk/blender/release/scripts/modules/bpy/path.py 2011-05-06 11:27:04 UTC (rev 36514) @@ -144,6 +144,9 @@ dirpath = os.path.dirname(dirpath) if not os.path.exists(dirpath): +if dirpath == path: +return path, False + dirpath, found = _ncase_path_found(dirpath) if not found: ___ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org http://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [36515] branches/particles-2010/source/ blender: Fixed a couple of issues pointed out by Brecht via bf-codereview.
Revision: 36515
http://projects.blender.org/scm/viewvc.php?view=revroot=bf-blenderrevision=36515
Author: lukastoenne
Date: 2011-05-06 13:04:47 + (Fri, 06 May 2011)
Log Message:
---
Fixed a couple of issues pointed out by Brecht via bf-codereview.
Modified Paths:
--
branches/particles-2010/source/blender/blenkernel/intern/node.c
branches/particles-2010/source/blender/editors/space_api/spacetypes.c
branches/particles-2010/source/blender/editors/space_node/drawnode.c
branches/particles-2010/source/blender/editors/space_node/node_edit.c
branches/particles-2010/source/blender/makesdna/DNA_node_types.h
branches/particles-2010/source/blender/nodes/intern/CMP_nodes/CMP_common.c
branches/particles-2010/source/blender/nodes/intern/node_common.c
Modified: branches/particles-2010/source/blender/blenkernel/intern/node.c
===
--- branches/particles-2010/source/blender/blenkernel/intern/node.c
2011-05-06 11:27:04 UTC (rev 36514)
+++ branches/particles-2010/source/blender/blenkernel/intern/node.c
2011-05-06 13:04:47 UTC (rev 36515)
@@ -464,8 +464,6 @@
sockdef= ntype-inputs;
while(sockdef-type != -1) {
sock = node_add_input_from_template(ntree, node,
sockdef);
- /* tag socket as static */
- sock-flag |= SOCK_STATIC;
sockdef++;
}
@@ -474,8 +472,6 @@
sockdef= ntype-outputs;
while(sockdef-type != -1) {
sock = node_add_output_from_template(ntree, node,
sockdef);
- /* tag socket as static */
- sock-flag |= SOCK_STATIC;
sockdef++;
}
Modified: branches/particles-2010/source/blender/editors/space_api/spacetypes.c
===
--- branches/particles-2010/source/blender/editors/space_api/spacetypes.c
2011-05-06 11:27:04 UTC (rev 36514)
+++ branches/particles-2010/source/blender/editors/space_api/spacetypes.c
2011-05-06 13:04:47 UTC (rev 36515)
@@ -63,7 +63,6 @@
#include ED_uvedit.h
#include ED_mball.h
#include ED_logic.h
-#include ED_particleset.h
/* only call once on startup, storage is global in BKE kernel listbase */
void ED_spacetypes_init(void)
Modified: branches/particles-2010/source/blender/editors/space_node/drawnode.c
===
--- branches/particles-2010/source/blender/editors/space_node/drawnode.c
2011-05-06 11:27:04 UTC (rev 36514)
+++ branches/particles-2010/source/blender/editors/space_node/drawnode.c
2011-05-06 13:04:47 UTC (rev 36515)
@@ -638,11 +638,7 @@
bNodeTree *ngroup= (bNodeTree*)gnode-id;
uiBut *bt;
- if (sock-flag SOCK_STATIC)
- uiDefBut(gnode-block, LABEL, 0, sock-name,
-sock-locx+xoffset, sock-locy+1+yoffset, 72,
NODE_DY,
-NULL, 0, 31, 0, 0, );
- else {
+ if (sock-flag SOCK_DYNAMIC) {
bt = uiDefBut(gnode-block, TEX, 0, ,
sock-locx+xoffset,
sock-locy+1+yoffset, 72, NODE_DY,
sock-name, 0, 31, 0, 0, );
@@ -651,6 +647,11 @@
else
uiButSetFunc(bt, update_group_output_cb, snode, ngroup);
}
+ else {
+ uiDefBut(gnode-block, LABEL, 0, sock-name,
+sock-locx+xoffset, sock-locy+1+yoffset, 72,
NODE_DY,
+NULL, 0, 31, 0, 0, );
+ }
}
static void draw_group_socket(const bContext *C, SpaceNode *snode, bNodeTree
*ntree, bNode *gnode, bNodeSocket *sock, bNodeSocket *gsock, int index, int
in_out)
@@ -708,20 +709,20 @@
draw_group_socket_name(snode, gnode, sock, in_out,
offset, -NODE_DYS);
}
- if (gsock !(gsock-flag SOCK_STATIC)) {
+ if (gsock (gsock-flag SOCK_DYNAMIC)) {
/* up/down buttons */
offset = (in_out==SOCK_IN ? -40 : 24);
uiBlockSetDirection(gnode-block, UI_TOP);
uiBlockBeginAlign(gnode-block);
bt = uiDefIconButO(gnode-block, BUT,
NODE_OT_group_socket_move_up, 0, ICON_TRIA_UP,
gsock-locx+offset,
gsock-locy, 16, 16, );
- if (!gsock-prev || (gsock-prev-flag SOCK_STATIC))
+ if (!gsock-prev || !(gsock-prev-flag SOCK_DYNAMIC))
uiButSetFlag(bt, UI_BUT_DISABLED);
RNA_int_set(uiButGetOperatorPtrRNA(bt), index, index);
RNA_enum_set(uiButGetOperatorPtrRNA(bt), in_out, in_out);
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [36516] branches/particles-2010/source/ blender: Removed the old experimental socket panel feature.
Revision: 36516
http://projects.blender.org/scm/viewvc.php?view=revroot=bf-blenderrevision=36516
Author: lukastoenne
Date: 2011-05-06 13:23:31 + (Fri, 06 May 2011)
Log Message:
---
Removed the old experimental socket panel feature. Only takes up space and is
not that useful.
Fixed a null pointer freeing bug in ntreeUpdateTree when the tree is empty.
Modified Paths:
--
branches/particles-2010/source/blender/blenkernel/BKE_node.h
branches/particles-2010/source/blender/blenkernel/intern/node.c
branches/particles-2010/source/blender/blenloader/intern/readfile.c
branches/particles-2010/source/blender/blenloader/intern/writefile.c
branches/particles-2010/source/blender/editors/space_node/drawnode.c
branches/particles-2010/source/blender/editors/space_node/node_draw.c
branches/particles-2010/source/blender/editors/space_node/node_edit.c
branches/particles-2010/source/blender/makesdna/DNA_node_types.h
branches/particles-2010/source/blender/makesrna/intern/rna_nodetree.c
Modified: branches/particles-2010/source/blender/blenkernel/BKE_node.h
===
--- branches/particles-2010/source/blender/blenkernel/BKE_node.h
2011-05-06 13:04:47 UTC (rev 36515)
+++ branches/particles-2010/source/blender/blenkernel/BKE_node.h
2011-05-06 13:23:31 UTC (rev 36516)
@@ -50,7 +50,6 @@
struct bNodeSocket;
struct bNodeStack;
struct bNodeTree;
-struct bNodeSocketPanel;
struct bNodeExec;
struct bNodeTreeExec;
struct GPUMaterial;
@@ -328,15 +327,6 @@
void nodeUnlinkNode(struct bNodeTree *ntree, struct bNode
*node);
void nodeUniqueName(struct bNodeTree *ntree, struct bNode
*node);
-struct bNodeSocketPanel *nodeFindInputPanel(struct bNode *node, const char
*name);
-struct bNodeSocketPanel *nodeFindOutputPanel(struct bNode *node, const char
*name);
-struct bNodeSocketPanel *nodeAddInputPanel(struct bNode *node, const char
*name, void *storage);
-struct bNodeSocketPanel *nodeAddOutputPanel(struct bNode *node, const char
*name, void *storage);
-void nodeRemoveInputPanel(struct bNodeTree *ntree, struct
bNode *node, struct bNodeSocketPanel *panel, int remove_sockets);
-void nodeRemoveOutputPanel(struct bNodeTree *ntree, struct
bNode *node, struct bNodeSocketPanel *panel, int remove_sockets);
-void nodeAssignInputPanel(struct bNode *node, struct
bNodeSocket *socket, struct bNodeSocketPanel *panel);
-void nodeAssignOutputPanel(struct bNode *node, struct
bNodeSocket *socket, struct bNodeSocketPanel *panel);
-
void nodeRegisterType(struct ListBase *typelist, struct
bNodeType *ntype) ;
void nodeMakeDynamicType(struct bNode *node);
intnodeDynamicUnlinkText(struct ID *txtid);
@@ -354,9 +344,7 @@
struct bNode *nodeFindNodebyName(struct bNodeTree *ntree, const char *name);
intnodeFindNode(struct bNodeTree *ntree, struct
bNodeSocket *sock, struct bNode **nodep, int *sockindex, int *in_out);
-intnodeFindNodeByPanel(struct bNodeTree *ntree,
struct bNodeSocketPanel *panel, struct bNode **nodep, int *panelindex);
-
struct bNodeLink *nodeFindLink(struct bNodeTree *ntree, struct bNodeSocket
*from, struct bNodeSocket *to);
intnodeCountSocketLinks(struct bNodeTree *ntree,
struct bNodeSocket *sock);
Modified: branches/particles-2010/source/blender/blenkernel/intern/node.c
===
--- branches/particles-2010/source/blender/blenkernel/intern/node.c
2011-05-06 13:04:47 UTC (rev 36515)
+++ branches/particles-2010/source/blender/blenkernel/intern/node.c
2011-05-06 13:23:31 UTC (rev 36516)
@@ -250,138 +250,6 @@
ntree-update |= NTREE_UPDATE_NODES;
}
-bNodeSocketPanel *nodeFindInputPanel(bNode *node, const char *name)
-{
- bNodeSocketPanel *panel= node-inpanels.first;
- for (; panel; panel = panel-next) {
- if (strcmp(panel-name, name)==0)
- return panel;
- }
- return NULL;
-}
-
-bNodeSocketPanel *nodeFindOutputPanel(bNode *node, const char *name)
-{
- bNodeSocketPanel *panel= node-outpanels.first;
- for (; panel; panel = panel-next) {
- if (strcmp(panel-name, name)==0)
- return panel;
- }
- return NULL;
-}
-
-bNodeSocketPanel *nodeAddInputPanel(bNode *node, const char *name, void
*storage)
-{
- bNodeSocketPanel *panel= nodeFindInputPanel(node, name);
- if (panel)
- return panel;
- panel = MEM_callocN(sizeof(bNodeSocketPanel), node socket panel);
- strcpy(panel-name, name);
- panel-collapsed = 0;
- panel-storage = storage;
-
- BLI_addtail(node-inpanels, panel);
-
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [36518] branches/particles-2010/source/ blender: Renamed the link validity flag and added some comments.
Revision: 36518
http://projects.blender.org/scm/viewvc.php?view=revroot=bf-blenderrevision=36518
Author: lukastoenne
Date: 2011-05-06 14:59:10 + (Fri, 06 May 2011)
Log Message:
---
Renamed the link validity flag and added some comments.
Make sure only the node typeinfo flag is read for CONST_OUTPUT and BACKGROUND
flags (even though node-flag should not be changed for these).
Modified Paths:
--
branches/particles-2010/source/blender/blenkernel/intern/node.c
branches/particles-2010/source/blender/editors/space_node/drawnode.c
branches/particles-2010/source/blender/editors/space_node/node_edit.c
branches/particles-2010/source/blender/makesdna/DNA_node_types.h
branches/particles-2010/source/blender/nodes/intern/node_exec.c
Modified: branches/particles-2010/source/blender/blenkernel/intern/node.c
===
--- branches/particles-2010/source/blender/blenkernel/intern/node.c
2011-05-06 13:33:47 UTC (rev 36517)
+++ branches/particles-2010/source/blender/blenkernel/intern/node.c
2011-05-06 14:59:10 UTC (rev 36518)
@@ -1421,12 +1421,12 @@
bNodeLink *link;
for (link = ntree-links.first; link; link = link-next) {
- link-flag |= NLINK_VALID;
+ link-flag |= NODE_LINK_VALID;
if (link-fromnode link-tonode link-fromnode-level =
link-tonode-level)
- link-flag = ~NLINK_VALID;
+ link-flag = ~NODE_LINK_VALID;
else if (ntreetype-validate_link) {
if (!ntreetype-validate_link(ntree, link))
- link-flag = ~NLINK_VALID;
+ link-flag = ~NODE_LINK_VALID;
}
}
}
Modified: branches/particles-2010/source/blender/editors/space_node/drawnode.c
===
--- branches/particles-2010/source/blender/editors/space_node/drawnode.c
2011-05-06 13:33:47 UTC (rev 36517)
+++ branches/particles-2010/source/blender/editors/space_node/drawnode.c
2011-05-06 14:59:10 UTC (rev 36518)
@@ -682,7 +682,7 @@
draw_value = !(gsock (gsock-flag SOCK_INTERNAL));
break;
case SOCK_OUT:
- if (gnode-flag NODE_CONST_OUTPUT)
+ if (gnode-typeinfo-flag NODE_CONST_OUTPUT)
draw_value = !(gsock gsock-link);
else
draw_value = 0;
@@ -2517,7 +2517,7 @@
}
else {
/* check cyclic */
- if((link-fromnode-level = link-tonode-level
link-tonode-level!=0xFFF) (link-flag NLINK_VALID)) {
+ if((link-fromnode-level = link-tonode-level
link-tonode-level!=0xFFF) (link-flag NODE_LINK_VALID)) {
if(link-fromnode-flag SELECT)
th_col1= TH_EDGE_SELECT;
if(link-tonode-flag SELECT)
Modified: branches/particles-2010/source/blender/editors/space_node/node_edit.c
===
--- branches/particles-2010/source/blender/editors/space_node/node_edit.c
2011-05-06 13:33:47 UTC (rev 36517)
+++ branches/particles-2010/source/blender/editors/space_node/node_edit.c
2011-05-06 14:59:10 UTC (rev 36518)
@@ -614,9 +614,9 @@
}
/* if one of the nodes is in the background and the other not */
- if ((a-flag NODE_BACKGROUND) !(b-flag NODE_BACKGROUND))
+ if ((a-flag NODE_BACKGROUND) !(b-typeinfo-flag
NODE_BACKGROUND))
return 0;
- else if (!(a-flag NODE_BACKGROUND) (b-flag NODE_BACKGROUND))
+ else if (!(a-flag NODE_BACKGROUND) (b-typeinfo-flag
NODE_BACKGROUND))
return 1;
/* if one has a higher selection state (active selected nothing) */
@@ -2104,7 +2104,7 @@
link = nodeAddLink(snode-edittree, node_fr, sock_fr,
node_to, sock_to);
/* validate the new link */
ntreeUpdateTree(snode-edittree);
- if (!(link-flag NLINK_VALID)) {
+ if (!(link-flag NODE_LINK_VALID)) {
nodeRemLink(snode-edittree, link);
continue;
}
Modified: branches/particles-2010/source/blender/makesdna/DNA_node_types.h
===
--- branches/particles-2010/source/blender/makesdna/DNA_node_types.h
2011-05-06 13:33:47 UTC (rev 36517)
+++ branches/particles-2010/source/blender/makesdna/DNA_node_types.h
2011-05-06 14:59:10 UTC (rev 36518)
@@ -189,7 +189,8 @@
int pad;
} bNodeLink;
-#define NLINK_VALID1
+/*
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [36519] trunk/blender/source/blender: Code cleanup: PIL_dynlib, renamed to BLI_dynlib, and other tweaks.
Revision: 36519
http://projects.blender.org/scm/viewvc.php?view=revroot=bf-blenderrevision=36519
Author: blendix
Date: 2011-05-06 15:17:42 + (Fri, 06 May 2011)
Log Message:
---
Code cleanup: PIL_dynlib, renamed to BLI_dynlib, and other tweaks.
Modified Paths:
--
trunk/blender/source/blender/blenkernel/intern/seqeffects.c
trunk/blender/source/blender/blenkernel/intern/texture.c
trunk/blender/source/blender/blenlib/CMakeLists.txt
trunk/blender/source/blender/blenlib/intern/dynlib.c
Added Paths:
---
trunk/blender/source/blender/blenlib/BLI_dynlib.h
Removed Paths:
-
trunk/blender/source/blender/blenlib/PIL_dynlib.h
Modified: trunk/blender/source/blender/blenkernel/intern/seqeffects.c
===
--- trunk/blender/source/blender/blenkernel/intern/seqeffects.c 2011-05-06
14:59:10 UTC (rev 36518)
+++ trunk/blender/source/blender/blenkernel/intern/seqeffects.c 2011-05-06
15:17:42 UTC (rev 36519)
@@ -37,7 +37,7 @@
#include stdlib.h
#include MEM_guardedalloc.h
-#include PIL_dynlib.h
+#include BLI_dynlib.h
#include BLI_math.h /* windows needs for M_PI */
#include BLI_utildefines.h
@@ -138,18 +138,18 @@
pis-instance_private_data = NULL;
/* clear the error list */
- PIL_dynlib_get_error_as_string(NULL);
+ BLI_dynlib_get_error_as_string(NULL);
- /* if(pis-handle) PIL_dynlib_close(pis-handle); */
+ /* if(pis-handle) BLI_dynlib_close(pis-handle); */
/* pis-handle= 0; */
/* open the needed object */
- pis-handle= PIL_dynlib_open(pis-name);
+ pis-handle= BLI_dynlib_open(pis-name);
if(test_dlerr(pis-name, pis-name)) return;
if (pis-handle != NULL) {
/* find the address of the version function */
- version= (int (*)(void))PIL_dynlib_find_symbol(pis-handle,
plugin_seq_getversion);
+ version= (int (*)(void))BLI_dynlib_find_symbol(pis-handle,
plugin_seq_getversion);
if (test_dlerr(pis-name, plugin_seq_getversion)) return;
if (version != NULL) {
@@ -158,7 +158,7 @@
int (*info_func)(PluginInfo *);
PluginInfo *info= (PluginInfo*)
MEM_mallocN(sizeof(PluginInfo), plugin_info);
- info_func= (int (*)(PluginInfo
*))PIL_dynlib_find_symbol(pis-handle, plugin_getinfo);
+ info_func= (int (*)(PluginInfo
*))BLI_dynlib_find_symbol(pis-handle, plugin_getinfo);
if(info_func == NULL) error(No info func);
else {
@@ -176,21 +176,21 @@
}
MEM_freeN(info);
- cp= PIL_dynlib_find_symbol(pis-handle,
seqname);
+ cp= BLI_dynlib_find_symbol(pis-handle,
seqname);
if(cp) strncpy(cp, seqname, 21);
} else {
printf (Plugin returned unrecognized version
number\n);
return;
}
}
- alloc_private = (void* (*)(void))PIL_dynlib_find_symbol(
+ alloc_private = (void* (*)(void))BLI_dynlib_find_symbol(
pis-handle, plugin_seq_alloc_private_data);
if (alloc_private) {
pis-instance_private_data = alloc_private();
}
pis-current_private_data = (void**)
- PIL_dynlib_find_symbol(
+ BLI_dynlib_find_symbol(
pis-handle, plugin_private_data);
}
}
@@ -229,12 +229,12 @@
{
if(pis==NULL) return;
- /* no PIL_dynlib_close: same plugin can be opened multiple times with 1
handle */
+ /* no BLI_dynlib_close: same plugin can be opened multiple times with 1
handle */
if (pis-instance_private_data) {
void (*free_private)(void *);
- free_private = (void (*)(void *))PIL_dynlib_find_symbol(
+ free_private = (void (*)(void *))BLI_dynlib_find_symbol(
pis-handle, plugin_seq_free_private_data);
if (free_private) {
free_private(pis-instance_private_data);
@@ -301,7 +301,7 @@
if(seq-plugin-cfra)
*(seq-plugin-cfra)= cfra;
- cp = PIL_dynlib_find_symbol(
+ cp = BLI_dynlib_find_symbol(
seq-plugin-handle, seqname);
if(cp) strncpy(cp, seq-name+2, 22);
Modified: trunk/blender/source/blender/blenkernel/intern/texture.c
===
---
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [36520] trunk/blender/intern/tools: Code cleanup: remove some unused scripts.
Revision: 36520 http://projects.blender.org/scm/viewvc.php?view=revroot=bf-blenderrevision=36520 Author: blendix Date: 2011-05-06 15:31:45 + (Fri, 06 May 2011) Log Message: --- Code cleanup: remove some unused scripts. Removed Paths: - trunk/blender/intern/tools/cpifdiff.sh trunk/blender/intern/tools/cvs-tools/ trunk/blender/intern/tools/tinderbox/ trunk/blender/intern/tools/update-cvs/ Deleted: trunk/blender/intern/tools/cpifdiff.sh === --- trunk/blender/intern/tools/cpifdiff.sh 2011-05-06 15:17:42 UTC (rev 36519) +++ trunk/blender/intern/tools/cpifdiff.sh 2011-05-06 15:31:45 UTC (rev 36520) @@ -1,83 +0,0 @@ -#!/bin/sh -# -# $Id$ -# -# * 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) 2002 by Hans Lambermont -# All rights reserved. -# -# The Original Code is: all of this file. -# -# Contributor(s): none yet. -# -# * END GPL LICENSE BLOCK * -# -# cp-if-diff copies src(s) to dst only if they are different, so trying -# not to unneccesarily break compiler dependencies - -numargs=$# - -if [ $numargs -lt 2 ]; then - echo Usage: cpifdiff source [source] target - exit 1 -fi - -cpargs=`expr $numargs - 1` -i=1 -while [ $i -le $cpargs ]; do -args=$args $1 - #echo arg $i = $args -i=`expr $i + 1` -shift -done -dst=$1 - -for src in $args; do - #echo $src to $dst - if [ ! -f $src ]; then - echo ERROR $src is not a file - exit 1 - fi - if [ -d $dst ]; then - src2=`echo $src | sed 's/.*\///'` - if [ -f $dst/$src2 ]; then - diff $src $dst 21 /dev/null - if [ $? -eq 0 ]; then - echo $src2 already installed - else - echo install $src - cp -f $src $dst - fi - else - echo Install $src - cp $src $dst - fi - elif [ -f $dst ]; then - diff $src $dst 21 /dev/null - if [ $? -eq 0 ]; then - echo $src already installed - else - echo install $src - cp -f $src $dst - fi - else - echo ERROR $dst is not a directory or a file - exit 1 - fi -done - ___ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org http://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [36521] branches/particles-2010/source/ blender: Fix for problematic storage of RNA property subtype values in blend files.
Revision: 36521 http://projects.blender.org/scm/viewvc.php?view=revroot=bf-blenderrevision=36521 Author: lukastoenne Date: 2011-05-06 19:38:51 + (Fri, 06 May 2011) Log Message: --- Fix for problematic storage of RNA property subtype values in blend files. This would break backwards compatibility sooner or later when the PropertySubType enum is changed. As a solution the socket default value subtypes are now a separate list of values in DNA. These values are then translated to RNA subtypes by makesrna. Modified Paths: -- branches/particles-2010/source/blender/makesdna/DNA_node_types.h branches/particles-2010/source/blender/makesrna/intern/rna_nodetree.c branches/particles-2010/source/blender/nodes/intern/CMP_nodes/CMP_alphaOver.c branches/particles-2010/source/blender/nodes/intern/CMP_nodes/CMP_blur.c branches/particles-2010/source/blender/nodes/intern/CMP_nodes/CMP_brightness.c branches/particles-2010/source/blender/nodes/intern/CMP_nodes/CMP_colorSpill.c branches/particles-2010/source/blender/nodes/intern/CMP_nodes/CMP_colorbalance.c branches/particles-2010/source/blender/nodes/intern/CMP_nodes/CMP_composite.c branches/particles-2010/source/blender/nodes/intern/CMP_nodes/CMP_curves.c branches/particles-2010/source/blender/nodes/intern/CMP_nodes/CMP_defocus.c branches/particles-2010/source/blender/nodes/intern/CMP_nodes/CMP_dilate.c branches/particles-2010/source/blender/nodes/intern/CMP_nodes/CMP_displace.c branches/particles-2010/source/blender/nodes/intern/CMP_nodes/CMP_filter.c branches/particles-2010/source/blender/nodes/intern/CMP_nodes/CMP_gamma.c branches/particles-2010/source/blender/nodes/intern/CMP_nodes/CMP_hueSatVal.c branches/particles-2010/source/blender/nodes/intern/CMP_nodes/CMP_huecorrect.c branches/particles-2010/source/blender/nodes/intern/CMP_nodes/CMP_idMask.c branches/particles-2010/source/blender/nodes/intern/CMP_nodes/CMP_invert.c branches/particles-2010/source/blender/nodes/intern/CMP_nodes/CMP_lensdist.c branches/particles-2010/source/blender/nodes/intern/CMP_nodes/CMP_mapUV.c branches/particles-2010/source/blender/nodes/intern/CMP_nodes/CMP_mapValue.c branches/particles-2010/source/blender/nodes/intern/CMP_nodes/CMP_math.c branches/particles-2010/source/blender/nodes/intern/CMP_nodes/CMP_mixrgb.c branches/particles-2010/source/blender/nodes/intern/CMP_nodes/CMP_normal.c branches/particles-2010/source/blender/nodes/intern/CMP_nodes/CMP_normalize.c branches/particles-2010/source/blender/nodes/intern/CMP_nodes/CMP_outputFile.c branches/particles-2010/source/blender/nodes/intern/CMP_nodes/CMP_rotate.c branches/particles-2010/source/blender/nodes/intern/CMP_nodes/CMP_scale.c branches/particles-2010/source/blender/nodes/intern/CMP_nodes/CMP_sepcombHSVA.c branches/particles-2010/source/blender/nodes/intern/CMP_nodes/CMP_sepcombRGBA.c branches/particles-2010/source/blender/nodes/intern/CMP_nodes/CMP_sepcombYCCA.c branches/particles-2010/source/blender/nodes/intern/CMP_nodes/CMP_sepcombYUVA.c branches/particles-2010/source/blender/nodes/intern/CMP_nodes/CMP_setalpha.c branches/particles-2010/source/blender/nodes/intern/CMP_nodes/CMP_texture.c branches/particles-2010/source/blender/nodes/intern/CMP_nodes/CMP_translate.c branches/particles-2010/source/blender/nodes/intern/CMP_nodes/CMP_valToRgb.c branches/particles-2010/source/blender/nodes/intern/CMP_nodes/CMP_vecBlur.c branches/particles-2010/source/blender/nodes/intern/CMP_nodes/CMP_viewer.c branches/particles-2010/source/blender/nodes/intern/CMP_nodes/CMP_zcombine.c branches/particles-2010/source/blender/nodes/intern/SHD_nodes/SHD_curves.c branches/particles-2010/source/blender/nodes/intern/SHD_nodes/SHD_hueSatVal.c branches/particles-2010/source/blender/nodes/intern/SHD_nodes/SHD_invert.c branches/particles-2010/source/blender/nodes/intern/SHD_nodes/SHD_mapping.c branches/particles-2010/source/blender/nodes/intern/SHD_nodes/SHD_material.c branches/particles-2010/source/blender/nodes/intern/SHD_nodes/SHD_math.c branches/particles-2010/source/blender/nodes/intern/SHD_nodes/SHD_mixRgb.c branches/particles-2010/source/blender/nodes/intern/SHD_nodes/SHD_normal.c branches/particles-2010/source/blender/nodes/intern/SHD_nodes/SHD_output.c branches/particles-2010/source/blender/nodes/intern/SHD_nodes/SHD_sepcombRGB.c branches/particles-2010/source/blender/nodes/intern/SHD_nodes/SHD_squeeze.c branches/particles-2010/source/blender/nodes/intern/SHD_nodes/SHD_texture.c branches/particles-2010/source/blender/nodes/intern/SHD_nodes/SHD_valToRgb.c branches/particles-2010/source/blender/nodes/intern/SHD_nodes/SHD_vectMath.c branches/particles-2010/source/blender/nodes/intern/TEX_nodes/TEX_at.c branches/particles-2010/source/blender/nodes/intern/TEX_nodes/TEX_bricks.c
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [36522] branches/particles-2010/source/ blender/makesrna/intern/rna_nodetree_types.h: Removed unused macros.
Revision: 36522 http://projects.blender.org/scm/viewvc.php?view=revroot=bf-blenderrevision=36522 Author: lukastoenne Date: 2011-05-06 19:45:04 + (Fri, 06 May 2011) Log Message: --- Removed unused macros. Modified Paths: -- branches/particles-2010/source/blender/makesrna/intern/rna_nodetree_types.h Modified: branches/particles-2010/source/blender/makesrna/intern/rna_nodetree_types.h === --- branches/particles-2010/source/blender/makesrna/intern/rna_nodetree_types.h 2011-05-06 19:38:51 UTC (rev 36521) +++ branches/particles-2010/source/blender/makesrna/intern/rna_nodetree_types.h 2011-05-06 19:45:04 UTC (rev 36522) @@ -32,18 +32,6 @@ #define DefNode(Category, ID, DefFunc, EnumName, StructName, UIName, UIDesc) #endif -#ifndef DefSocketSubtypeInt -#define DefSocketSubtypeInt(name, subtype) -#endif - -#ifndef DefSocketSubtypeFloat -#define DefSocketSubtypeFloat(name, subtype) -#endif - -#ifndef DefSocketSubtypeVector -#define DefSocketSubtypeVector(name, subtype) -#endif - /* Tree type Node ID RNA def functionEnum name Struct name UI Name UI Description */ DefNode( ShaderNode, SH_NODE_OUTPUT, 0, OUTPUT, Output, Output, ) DefNode( ShaderNode, SH_NODE_MATERIAL,def_sh_material, MATERIAL, Material, Material,) @@ -156,29 +144,5 @@ DefNode( TextureNode,TEX_NODE_SCALE, 0, SCALE, Scale,Scale, ) - -/* nameproperty subtype */ -DefSocketSubtypeInt( None, PROP_NONE ) -DefSocketSubtypeInt( Unsigned, PROP_UNSIGNED ) - -DefSocketSubtypeFloat( None, PROP_NONE ) -DefSocketSubtypeFloat( Unsigned, PROP_UNSIGNED ) -DefSocketSubtypeFloat( Percentage, PROP_PERCENTAGE) -DefSocketSubtypeFloat( Factor, PROP_FACTOR) -DefSocketSubtypeFloat( Angle, PROP_ANGLE ) -DefSocketSubtypeFloat( Time, PROP_TIME ) -DefSocketSubtypeFloat( Distance, PROP_DISTANCE ) - -DefSocketSubtypeVector( None, PROP_NONE ) -DefSocketSubtypeVector( Translation,PROP_TRANSLATION ) -DefSocketSubtypeVector( Direction, PROP_DIRECTION ) -DefSocketSubtypeVector( Velocity, PROP_VELOCITY ) -DefSocketSubtypeVector( Acceleration, PROP_ACCELERATION ) -DefSocketSubtypeVector( Euler, PROP_EULER ) -DefSocketSubtypeVector( XYZ,PROP_XYZ ) - /* undefine macros */ #undef DefNode -#undef DefSocketSubtypeInt -#undef DefSocketSubtypeFloat -#undef DefSocketSubtypeVector ___ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org http://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [36523] trunk/blender: Code cleanup: remove source/kernel module, this wasn't really the kernel of
Revision: 36523 http://projects.blender.org/scm/viewvc.php?view=revroot=bf-blenderrevision=36523 Author: blendix Date: 2011-05-06 20:18:42 + (Fri, 06 May 2011) Log Message: --- Code cleanup: remove source/kernel module, this wasn't really the kernel of anything, only contained a hash map and functions to pass command line args to the game engine. Moved those to container and BlenderRoutines modules. Modified Paths: -- trunk/blender/SConstruct trunk/blender/build_files/scons/config/darwin-config.py trunk/blender/doc/doxygen/doxygen.source trunk/blender/intern/container/CMakeLists.txt trunk/blender/intern/container/CTR_Map.h trunk/blender/intern/container/SConscript trunk/blender/source/CMakeLists.txt trunk/blender/source/SConscript trunk/blender/source/blender/editors/space_view3d/CMakeLists.txt trunk/blender/source/blender/editors/space_view3d/SConscript trunk/blender/source/blender/editors/space_view3d/view3d_view.c trunk/blender/source/blender/readblenfile/CMakeLists.txt trunk/blender/source/blender/readblenfile/SConscript trunk/blender/source/blender/readblenfile/stub/BLO_readblenfileSTUB.c trunk/blender/source/blender/render/CMakeLists.txt trunk/blender/source/blender/windowmanager/CMakeLists.txt trunk/blender/source/blender/windowmanager/SConscript trunk/blender/source/blender/windowmanager/intern/wm_init_exit.c trunk/blender/source/blenderplayer/CMakeLists.txt trunk/blender/source/creator/CMakeLists.txt trunk/blender/source/creator/SConscript trunk/blender/source/creator/creator.c trunk/blender/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp trunk/blender/source/gameengine/BlenderRoutines/CMakeLists.txt trunk/blender/source/gameengine/BlenderRoutines/SConscript trunk/blender/source/gameengine/Converter/BL_ActionActuator.h trunk/blender/source/gameengine/Converter/BL_ArmatureActuator.cpp trunk/blender/source/gameengine/Converter/BL_ArmatureActuator.h trunk/blender/source/gameengine/Converter/BL_ArmatureChannel.h trunk/blender/source/gameengine/Converter/BL_ArmatureConstraint.cpp trunk/blender/source/gameengine/Converter/BL_ArmatureConstraint.h trunk/blender/source/gameengine/Converter/BL_ArmatureObject.cpp trunk/blender/source/gameengine/Converter/BL_ArmatureObject.h trunk/blender/source/gameengine/Converter/BL_BlenderDataConversion.cpp trunk/blender/source/gameengine/Converter/BL_BlenderDataConversion.h trunk/blender/source/gameengine/Converter/BL_DeformableGameObject.h trunk/blender/source/gameengine/Converter/BL_MeshDeformer.cpp trunk/blender/source/gameengine/Converter/BL_MeshDeformer.h trunk/blender/source/gameengine/Converter/BL_ModifierDeformer.cpp trunk/blender/source/gameengine/Converter/BL_ShapeActionActuator.h trunk/blender/source/gameengine/Converter/BL_ShapeDeformer.cpp trunk/blender/source/gameengine/Converter/BL_SkinDeformer.cpp trunk/blender/source/gameengine/Converter/BL_SkinDeformer.h trunk/blender/source/gameengine/Converter/CMakeLists.txt trunk/blender/source/gameengine/Converter/KX_BlenderSceneConverter.cpp trunk/blender/source/gameengine/Converter/KX_BlenderSceneConverter.h trunk/blender/source/gameengine/Converter/KX_SoftBodyDeformer.cpp trunk/blender/source/gameengine/Converter/KX_SoftBodyDeformer.h trunk/blender/source/gameengine/Converter/SConscript trunk/blender/source/gameengine/Expressions/CMakeLists.txt trunk/blender/source/gameengine/Expressions/SConscript trunk/blender/source/gameengine/GameLogic/CMakeLists.txt trunk/blender/source/gameengine/GameLogic/SCA_ILogicBrick.cpp trunk/blender/source/gameengine/GameLogic/SCA_ILogicBrick.h trunk/blender/source/gameengine/GameLogic/SCA_LogicManager.h trunk/blender/source/gameengine/GameLogic/SCA_PropertyActuator.cpp trunk/blender/source/gameengine/GameLogic/SCA_PropertyActuator.h trunk/blender/source/gameengine/GameLogic/SConscript trunk/blender/source/gameengine/GamePlayer/common/CMakeLists.txt trunk/blender/source/gameengine/GamePlayer/common/GPC_Engine.cpp trunk/blender/source/gameengine/GamePlayer/common/SConscript trunk/blender/source/gameengine/GamePlayer/ghost/CMakeLists.txt trunk/blender/source/gameengine/GamePlayer/ghost/GPG_Application.cpp trunk/blender/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp trunk/blender/source/gameengine/GamePlayer/ghost/SConscript trunk/blender/source/gameengine/Ketsji/CMakeLists.txt trunk/blender/source/gameengine/Ketsji/KXNetwork/CMakeLists.txt trunk/blender/source/gameengine/Ketsji/KXNetwork/SConscript trunk/blender/source/gameengine/Ketsji/KX_CameraActuator.cpp trunk/blender/source/gameengine/Ketsji/KX_CameraActuator.h trunk/blender/source/gameengine/Ketsji/KX_ConvertPhysicsObjects.cpp trunk/blender/source/gameengine/Ketsji/KX_GameObject.cpp
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [36524] trunk/blender/build_files/scons/ config/darwin-config.py: Forgot to mention that for scons, I' ve disabled install of the texture and
Revision: 36524 http://projects.blender.org/scm/viewvc.php?view=revroot=bf-blenderrevision=36524 Author: blendix Date: 2011-05-06 20:21:20 + (Fri, 06 May 2011) Log Message: --- Forgot to mention that for scons, I've disabled install of the texture and sequence plugins, as was already done for cmake, they don't work in 2.5. This is a fix for last commit, this file shouldn't have been included. Modified Paths: -- trunk/blender/build_files/scons/config/darwin-config.py Modified: trunk/blender/build_files/scons/config/darwin-config.py === --- trunk/blender/build_files/scons/config/darwin-config.py 2011-05-06 20:18:42 UTC (rev 36523) +++ trunk/blender/build_files/scons/config/darwin-config.py 2011-05-06 20:21:20 UTC (rev 36524) @@ -14,7 +14,7 @@ ### Cocoa architecture settings ## # WITH_GHOST_COCOA=True -MACOSX_ARCHITECTURE = 'x86_64' # valid archs: ppc, i386, ppc64, x86_64 +MACOSX_ARCHITECTURE = 'i386' # valid archs: ppc, i386, ppc64, x86_64 cmd = 'uname -p' ___ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org http://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [36525] trunk/blender/source/blender: fix [#27298] Alt + RMB always extends selection
Revision: 36525
http://projects.blender.org/scm/viewvc.php?view=revroot=bf-blenderrevision=36525
Author: campbellbarton
Date: 2011-05-06 23:46:24 + (Fri, 06 May 2011)
Log Message:
---
fix [#27298] Alt + RMB always extends selection
Modified Paths:
--
trunk/blender/source/blender/blenlib/intern/math_geom.c
trunk/blender/source/blender/editors/object/object_select.c
Modified: trunk/blender/source/blender/blenlib/intern/math_geom.c
===
--- trunk/blender/source/blender/blenlib/intern/math_geom.c 2011-05-06
20:21:20 UTC (rev 36524)
+++ trunk/blender/source/blender/blenlib/intern/math_geom.c 2011-05-06
23:46:24 UTC (rev 36525)
@@ -1789,7 +1789,7 @@
matrix[3][2] = -(farClip + nearClip)/Zdelta;
}
-void perspective_m4(float mat[][4],float left, const float right, const float
bottom, const float top, const float nearClip, const float farClip)
+void perspective_m4(float mat[4][4], const float left, const float right,
const float bottom, const float top, const float nearClip, const float farClip)
{
float Xdelta, Ydelta, Zdelta;
Modified: trunk/blender/source/blender/editors/object/object_select.c
===
--- trunk/blender/source/blender/editors/object/object_select.c 2011-05-06
20:21:20 UTC (rev 36524)
+++ trunk/blender/source/blender/editors/object/object_select.c 2011-05-06
23:46:24 UTC (rev 36525)
@@ -894,7 +894,7 @@
if(!extend) {
CTX_DATA_BEGIN(C, Base*, base, selectable_bases) {
- if((base-flag SELECT) == 0) {
+ if(base-flag SELECT) {
ED_base_object_select(base, BA_DESELECT);
changed= 1;
}
___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [36526] trunk/blender/release/scripts/ startup/bl_ui/properties_data_modifier.py: missed updating warp modifier UI , gave a py error when selecting te
Revision: 36526 http://projects.blender.org/scm/viewvc.php?view=revroot=bf-blenderrevision=36526 Author: campbellbarton Date: 2011-05-06 23:54:40 + (Fri, 06 May 2011) Log Message: --- missed updating warp modifier UI, gave a py error when selecting texture UI layer. Modified Paths: -- trunk/blender/release/scripts/startup/bl_ui/properties_data_modifier.py Modified: trunk/blender/release/scripts/startup/bl_ui/properties_data_modifier.py === --- trunk/blender/release/scripts/startup/bl_ui/properties_data_modifier.py 2011-05-06 23:46:24 UTC (rev 36525) +++ trunk/blender/release/scripts/startup/bl_ui/properties_data_modifier.py 2011-05-06 23:54:40 UTC (rev 36526) @@ -675,7 +675,7 @@ if md.texture_coords == 'OBJECT': layout.prop(md, texture_coordinate_object, text=Object) elif md.texture_coords == 'UV' and ob.type == 'MESH': -layout.prop_object(md, uv_layer, ob.data, uv_textures) +layout.prop_search(md, uv_layer, ob.data, uv_textures) def WAVE(self, layout, ob, md): split = layout.split() ___ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org http://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [36527] trunk/blender/build_files/cmake/ packaging.cmake: patch from Dan Eicher, CPack/RPM working again
Revision: 36527
http://projects.blender.org/scm/viewvc.php?view=revroot=bf-blenderrevision=36527
Author: campbellbarton
Date: 2011-05-06 23:59:15 + (Fri, 06 May 2011)
Log Message:
---
patch from Dan Eicher, CPack/RPM working again
Modified Paths:
--
trunk/blender/build_files/cmake/packaging.cmake
Modified: trunk/blender/build_files/cmake/packaging.cmake
===
--- trunk/blender/build_files/cmake/packaging.cmake 2011-05-06 23:54:40 UTC
(rev 36526)
+++ trunk/blender/build_files/cmake/packaging.cmake 2011-05-06 23:59:15 UTC
(rev 36527)
@@ -31,17 +31,20 @@
# Force Package Name
-set(CPACK_PACKAGE_FILE_NAME
${PROJECT_NAME}-${BLENDER_VERSION}-r${BUILD_REV}-${CPACK_SYSTEM_NAME}-${CMAKE_SYSTEM_PROCESSOR})
+set(CPACK_PACKAGE_FILE_NAME
${PROJECT_NAME}-${BLENDER_VERSION}-r${BUILD_REV}-${CMAKE_SYSTEM_PROCESSOR})
if(CMAKE_SYSTEM_NAME MATCHES Linux)
# RPM packages
include(build_files/cmake/RpmBuild.cmake)
if(RPMBUILD_FOUND AND NOT WIN32)
set(CPACK_GENERATOR RPM)
- set(CPACK_SET_DESTDIR TRUE)
+ set(CPACK_RPM_PACKAGE_RELEASE r${BUILD_REV})
+ set(CPACK_SET_DESTDIR true)
set(CPACK_PACKAGE_DESCRIPTION_SUMMARY ${PROJECT_DESCRIPTION})
+ set(CPACK_PACKAGE_RELOCATABLE false)
set(CPACK_RPM_PACKAGE_LICENSE GPLv2)
set(CPACK_RPM_PACKAGE_GROUP Amusements/Graphics)
+ set(CPACK_RPM_USER_BINARY_SPECFILE
${CMAKE_SOURCE_DIR}/build_files/package_spec/blender.spec.in)
endif()
endif()
___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [36528] trunk/blender/build_files: missed this last commit, also moved rpm spec into a subdir
Revision: 36528
http://projects.blender.org/scm/viewvc.php?view=revroot=bf-blenderrevision=36528
Author: campbellbarton
Date: 2011-05-07 00:02:39 + (Sat, 07 May 2011)
Log Message:
---
missed this last commit, also moved rpm spec into a subdir
Modified Paths:
--
trunk/blender/build_files/cmake/packaging.cmake
Added Paths:
---
trunk/blender/build_files/package_spec/rpm/
trunk/blender/build_files/package_spec/rpm/blender.spec.in
Modified: trunk/blender/build_files/cmake/packaging.cmake
===
--- trunk/blender/build_files/cmake/packaging.cmake 2011-05-06 23:59:15 UTC
(rev 36527)
+++ trunk/blender/build_files/cmake/packaging.cmake 2011-05-07 00:02:39 UTC
(rev 36528)
@@ -44,7 +44,7 @@
set(CPACK_PACKAGE_RELOCATABLE false)
set(CPACK_RPM_PACKAGE_LICENSE GPLv2)
set(CPACK_RPM_PACKAGE_GROUP Amusements/Graphics)
- set(CPACK_RPM_USER_BINARY_SPECFILE
${CMAKE_SOURCE_DIR}/build_files/package_spec/blender.spec.in)
+ set(CPACK_RPM_USER_BINARY_SPECFILE
${CMAKE_SOURCE_DIR}/build_files/package_spec/rpm/blender.spec.in)
endif()
endif()
Added: trunk/blender/build_files/package_spec/rpm/blender.spec.in
===
--- trunk/blender/build_files/package_spec/rpm/blender.spec.in
(rev 0)
+++ trunk/blender/build_files/package_spec/rpm/blender.spec.in 2011-05-07
00:02:39 UTC (rev 36528)
@@ -0,0 +1,69 @@
+# -*- rpm-spec -*-
+%global __python %{__python3}
+
+BuildRoot:
@CPACK_RPM_DIRECTORY@/@CPACK_PACKAGE_FILE_NAME@@CPACK_RPM_PACKAGE_COMPONENT_PART_PATH@
+Summary:@CPACK_RPM_PACKAGE_SUMMARY@
+Name: @CPACK_RPM_PACKAGE_NAME@
+Version:@CPACK_RPM_PACKAGE_VERSION@
+Release:@CPACK_RPM_PACKAGE_RELEASE@
+License:@CPACK_RPM_PACKAGE_LICENSE@
+Group: @CPACK_RPM_PACKAGE_GROUP@
+Vendor: @CPACK_RPM_PACKAGE_VENDOR@
+
+%define _rpmdir @CPACK_RPM_DIRECTORY@
+%define _rpmfilename @CPACK_RPM_FILE_NAME@
+%define _unpackaged_files_terminate_build 0
+%define _topdir @CPACK_RPM_DIRECTORY@
+
+%description
+Blender is an integrated 3d suite for modelling, animation, rendering,
+post-production, interactive creation and playback (games). Blender has its
+own particular user interface, which is implemented entirely in OpenGL and
+designed with speed in mind. Python bindings are available for scripting;
+import/export features for popular file formats like 3D Studio and Wavefront
+Obj are implemented as scripts by the community. Stills, animations, models
+for games or other third party engines and interactive content in the form of
+a standalone binary and/or a web plug-in are common products of Blender use.
+
+# This is a shortcutted spec file generated by CMake RPM generator
+# we skip _install step because CPack does that for us.
+# We do only save CPack installed tree in _prepr
+# and then restore it in build.
+%prep
+mv ${RPM_BUILD_ROOT} @CPACK_TOPLEVEL_DIRECTORY@/tmpBBroot
+
+%install
+if [ -e ${RPM_BUILD_ROOT} ];
+then
+ rm -rf ${RPM_BUILD_ROOT}
+fi
+mv @CPACK_TOPLEVEL_DIRECTORY@/tmpBBroot ${RPM_BUILD_ROOT}
+
+%clean
+rm -rf ${RPM_BUILD_ROOT}
+
+%post
+touch --no-create %{_datadir}/icons/hicolor
+if [ -x %{_bindir}/gtk-update-icon-cache ]; then
+ %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor
+fi
+%{_bindir}/update-desktop-database %{_datadir}/applications || :
+
+%postun
+%{_bindir}/update-desktop-database %{_datadir}/applications
+touch --no-create %{_datadir}/icons/hicolor
+if [ -x %{_bindir}/gtk-update-icon-cache ]; then
+ %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor
+fi || :
+
+%files
+%defattr(-,root,root,-)
+%{_bindir}/%{name}
+%{_datadir}/%{name}/@CPACK_PACKAGE_VERSION_MAJOR@.@CPACK_PACKAGE_VERSION_MINOR@
+%{_datadir}/icons/hicolor/*/apps/%{name}.*
+%{_datadir}/applications/%{name}.desktop
+%{_datadir}/doc/blender
+%{_mandir}/man1/blender.*
+
+%changelog
+@CPACK_RPM_SPEC_CHANGELOG@
___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [36530] branches/bmesh/blender: =bmesh=
Revision: 36530
http://projects.blender.org/scm/viewvc.php?view=revroot=bf-blenderrevision=36530
Author: joeedh
Date: 2011-05-07 02:48:14 + (Sat, 07 May 2011)
Log Message:
---
=bmesh=
Cut out some unwanted differences with trunk
in preparation for merge. Also fixed some
warnings, though many remain.
Modified Paths:
--
branches/bmesh/blender/intern/audaspace/Python/AUD_PyAPI.cpp
branches/bmesh/blender/source/blender/blenlib/BLI_math_geom.h
branches/bmesh/blender/source/blender/blenlib/intern/BLI_cellalloc.c
branches/bmesh/blender/source/blender/blenlib/intern/math_geom.c
branches/bmesh/blender/source/blender/bmesh/operators/bevel.c
branches/bmesh/blender/source/blender/collada/CMakeLists.txt
branches/bmesh/blender/source/blender/collada/DocumentExporter.cpp
branches/bmesh/blender/source/blender/editors/curve/editcurve.c
branches/bmesh/blender/source/blender/editors/curve/editfont.c
branches/bmesh/blender/source/blender/editors/gpencil/drawgpencil.c
branches/bmesh/blender/source/blender/editors/gpencil/gpencil_paint.c
branches/bmesh/blender/source/blender/editors/include/ED_curve.h
branches/bmesh/blender/source/blender/editors/interface/interface_style.c
branches/bmesh/blender/source/blender/editors/mesh/bmesh_select.c
branches/bmesh/blender/source/blender/editors/mesh/bmesh_tools.c
branches/bmesh/blender/source/blender/editors/mesh/bmeshutils.c
branches/bmesh/blender/source/blender/editors/mesh/editbmesh_add.c
branches/bmesh/blender/source/blender/editors/mesh/editbmesh_bvh.c
branches/bmesh/blender/source/blender/editors/mesh/mesh_data.c
branches/bmesh/blender/source/blender/editors/metaball/mball_edit.c
branches/bmesh/blender/source/blender/editors/screen/screen_edit.c
branches/bmesh/blender/source/blender/editors/space_view3d/drawarmature.c
branches/bmesh/blender/source/blender/makesdna/DNA_modifier_types.h
branches/bmesh/blender/source/blender/makesdna/DNA_object_types.h
branches/bmesh/blender/source/blender/makesrna/rna_cleanup/rna_properties.txt
branches/bmesh/blender/source/blender/makesrna/rna_cleanup/rna_update.sh
branches/bmesh/blender/source/blender/python/generic/mathutils_geometry.c
Modified: branches/bmesh/blender/intern/audaspace/Python/AUD_PyAPI.cpp
===
--- branches/bmesh/blender/intern/audaspace/Python/AUD_PyAPI.cpp
2011-05-07 02:33:57 UTC (rev 36529)
+++ branches/bmesh/blender/intern/audaspace/Python/AUD_PyAPI.cpp
2011-05-07 02:48:14 UTC (rev 36530)
@@ -2214,6 +2214,7 @@
switch(device)
{
case AUD_DEVICE_NULL:
+ (void)specs; /* quiet warning when others
disabled */
self-device = new AUD_NULLDevice();
break;
case AUD_DEVICE_OPENAL:
Modified: branches/bmesh/blender/source/blender/blenlib/BLI_math_geom.h
===
--- branches/bmesh/blender/source/blender/blenlib/BLI_math_geom.h
2011-05-07 02:33:57 UTC (rev 36529)
+++ branches/bmesh/blender/source/blender/blenlib/BLI_math_geom.h
2011-05-07 02:48:14 UTC (rev 36530)
@@ -44,8 +44,8 @@
/** Polygons */
-void cent_tri_v3(float r[3], float a[3], float b[3], float c[3]);
-void cent_quad_v3(float r[3], float a[3], float b[3], float c[3], float d[3]);
+void cent_tri_v3(float r[3], const float a[3], const float b[3], const float
c[3]);
+void cent_quad_v3(float r[3], const float a[3], const float b[3], const float
c[3], const float d[3]);
float normal_tri_v3(float r[3], const float a[3], const float b[3], const
float c[3]);
float normal_quad_v3(float r[3], const float a[3], const float b[3], const
float c[3], const float d[3]);
@@ -54,24 +54,24 @@
float area_tri_signed_v2(const float v1[2], const float v2[2], const float
v3[2]);
float area_tri_v3(const float a[3], const float b[3], const float c[3]);
float area_quad_v3(const float a[3], const float b[3], const float c[3], const
float d[3]);
-float area_poly_v3(int nr, float verts[][3], float normal[3]);
+float area_poly_v3(int nr, float verts[][3], const float normal[3]);
+int is_quad_convex_v3(const float *v1, const float *v2, const float *v3, const
float *v4);
+
/* Distance **/
-float dist_to_line_v2(float p[2], float l1[2], float l2[2]);
-float dist_to_line_segment_v2(float p[2], float l1[2], float l2[2]);
+float dist_to_line_v2(const float p[2], const float l1[2], const float l2[2]);
+float dist_to_line_segment_v2(const float p[2], const float l1[2], const float
l2[2]);
-float dist_to_line_segment_v3(float p[3], float l1[3], float l2[3]);
+float
