[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [41120] branches/soc-2011-tomato: Merging r41093 through r41119 from trunk into soc-2011-tomato
Sergey Sharybin
g.ulairi at gmail.com
Wed Oct 19 23:37:08 CEST 2011
Revision: 41120
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=41120
Author: nazgul
Date: 2011-10-19 21:37:07 +0000 (Wed, 19 Oct 2011)
Log Message:
-----------
Merging r41093 through r41119 from trunk into soc-2011-tomato
This revision wouldn't compile, fix will came soon with codereview-related changes.
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=41093
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=41119
Modified Paths:
--------------
branches/soc-2011-tomato/release/scripts/startup/bl_operators/wm.py
branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_view3d.py
branches/soc-2011-tomato/source/blender/blenkernel/BKE_node.h
branches/soc-2011-tomato/source/blender/blenkernel/intern/depsgraph.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/image.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/node.c
branches/soc-2011-tomato/source/blender/blenloader/intern/readfile.c
branches/soc-2011-tomato/source/blender/editors/render/render_internal.c
branches/soc-2011-tomato/source/blender/editors/space_node/node_draw.c
branches/soc-2011-tomato/source/blender/editors/space_node/node_edit.c
branches/soc-2011-tomato/source/blender/editors/space_node/space_node.c
branches/soc-2011-tomato/source/blender/editors/space_view3d/drawarmature.c
branches/soc-2011-tomato/source/blender/makesdna/DNA_node_types.h
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_nodetree.c
branches/soc-2011-tomato/source/blender/nodes/composite/node_composite_tree.c
branches/soc-2011-tomato/source/blender/nodes/intern/node_common.c
branches/soc-2011-tomato/source/blender/nodes/shader/node_shader_tree.c
branches/soc-2011-tomato/source/blender/nodes/texture/node_texture_tree.c
branches/soc-2011-tomato/source/blender/render/intern/source/pipeline.c
branches/soc-2011-tomato/source/darwin/blender.app/Contents/Info.plist
Added Paths:
-----------
branches/soc-2011-tomato/source/darwin/set_simulation_threads.app/
branches/soc-2011-tomato/source/darwin/set_simulation_threads.app/Contents/
branches/soc-2011-tomato/source/darwin/set_simulation_threads.app/Contents/Info.plist
branches/soc-2011-tomato/source/darwin/set_simulation_threads.app/Contents/MacOS/
branches/soc-2011-tomato/source/darwin/set_simulation_threads.app/Contents/MacOS/applet
branches/soc-2011-tomato/source/darwin/set_simulation_threads.app/Contents/PkgInfo
branches/soc-2011-tomato/source/darwin/set_simulation_threads.app/Contents/Resources/
branches/soc-2011-tomato/source/darwin/set_simulation_threads.app/Contents/Resources/Scripts/
branches/soc-2011-tomato/source/darwin/set_simulation_threads.app/Contents/Resources/Scripts/main.scpt
branches/soc-2011-tomato/source/darwin/set_simulation_threads.app/Contents/Resources/applet.icns
branches/soc-2011-tomato/source/darwin/set_simulation_threads.app/Contents/Resources/applet.rsrc
branches/soc-2011-tomato/source/darwin/set_simulation_threads.app/Contents/Resources/description.rtfd/
branches/soc-2011-tomato/source/darwin/set_simulation_threads.app/Contents/Resources/description.rtfd/TXT.rtf
Removed Paths:
-------------
branches/soc-2011-tomato/source/darwin/set_simulation_threads.app/
branches/soc-2011-tomato/source/darwin/set_simulation_threads.app/Contents/
branches/soc-2011-tomato/source/darwin/set_simulation_threads.app/Contents/Info.plist
branches/soc-2011-tomato/source/darwin/set_simulation_threads.app/Contents/MacOS/
branches/soc-2011-tomato/source/darwin/set_simulation_threads.app/Contents/MacOS/applet
branches/soc-2011-tomato/source/darwin/set_simulation_threads.app/Contents/PkgInfo
branches/soc-2011-tomato/source/darwin/set_simulation_threads.app/Contents/Resources/
branches/soc-2011-tomato/source/darwin/set_simulation_threads.app/Contents/Resources/Scripts/
branches/soc-2011-tomato/source/darwin/set_simulation_threads.app/Contents/Resources/Scripts/main.scpt
branches/soc-2011-tomato/source/darwin/set_simulation_threads.app/Contents/Resources/applet.icns
branches/soc-2011-tomato/source/darwin/set_simulation_threads.app/Contents/Resources/applet.rsrc
branches/soc-2011-tomato/source/darwin/set_simulation_threads.app/Contents/Resources/description.rtfd/
branches/soc-2011-tomato/source/darwin/set_simulation_threads.app/Contents/Resources/description.rtfd/TXT.rtf
branches/soc-2011-tomato/source/darwin/set_simulation_threads_applescript.scpt
Property Changed:
----------------
branches/soc-2011-tomato/
branches/soc-2011-tomato/source/blender/editors/space_outliner/
branches/soc-2011-tomato/source/tools/spell_check_source.py
branches/soc-2011-tomato/source/tools/spell_check_source_config.py
Property changes on: branches/soc-2011-tomato
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/vgroup_modifiers:38694-39989
/trunk/blender:36831-41092
+ /branches/vgroup_modifiers:38694-39989
/trunk/blender:36831-41119
Modified: branches/soc-2011-tomato/release/scripts/startup/bl_operators/wm.py
===================================================================
--- branches/soc-2011-tomato/release/scripts/startup/bl_operators/wm.py 2011-10-19 19:15:35 UTC (rev 41119)
+++ branches/soc-2011-tomato/release/scripts/startup/bl_operators/wm.py 2011-10-19 21:37:07 UTC (rev 41120)
@@ -1161,7 +1161,7 @@
elif not os.path.isdir(path_src):
self.report({'ERROR'}, "Source path %r exists" % path_src)
else:
- shutil.copytree(path_src, path_dst)
+ shutil.copytree(path_src, path_dst, symlinks=True)
# in 2.57 and earlier windows installers, system scripts were copied
# into the configuration directory, don't want to copy those
Modified: branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_view3d.py
===================================================================
--- branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_view3d.py 2011-10-19 19:15:35 UTC (rev 41119)
+++ branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_view3d.py 2011-10-19 21:37:07 UTC (rev 41120)
@@ -56,9 +56,9 @@
# Contains buttons like Mode, Pivot, Manipulator, Layer, Mesh Select Mode...
- layout.template_header_3D()
+ row = layout.row() #XXX Narrowed down vert/edge/face selector in edit mode/solid drawmode. -DingTo
+ row.template_header_3D()
- row = layout.row()
if obj:
# Particle edit
if obj.mode == 'PARTICLE_EDIT':
Modified: branches/soc-2011-tomato/source/blender/blenkernel/BKE_node.h
===================================================================
--- branches/soc-2011-tomato/source/blender/blenkernel/BKE_node.h 2011-10-19 19:15:35 UTC (rev 41119)
+++ branches/soc-2011-tomato/source/blender/blenkernel/BKE_node.h 2011-10-19 21:37:07 UTC (rev 41120)
@@ -346,9 +346,8 @@
int nodeSetActiveID(struct bNodeTree *ntree, short idtype, struct ID *id);
void nodeClearActiveID(struct bNodeTree *ntree, short idtype);
-void NodeTagChanged(struct bNodeTree *ntree, struct bNode *node);
-int NodeTagIDChanged(struct bNodeTree *ntree, struct ID *id);
-void ntreeClearTags(struct bNodeTree *ntree);
+void nodeUpdate(struct bNodeTree *ntree, struct bNode *node);
+int nodeUpdateID(struct bNodeTree *ntree, struct ID *id);
void nodeFreePreview(struct bNode *node);
@@ -605,9 +604,9 @@
int ntreeCompositTagAnimated(struct bNodeTree *ntree);
void ntreeCompositTagGenerators(struct bNodeTree *ntree);
void ntreeCompositForceHidden(struct bNodeTree *ntree, struct Scene *scene);
+void ntreeCompositClearTags(struct bNodeTree *ntree);
-
/* ************** TEXTURE NODES *************** */
struct TexResult;
Modified: branches/soc-2011-tomato/source/blender/blenkernel/intern/depsgraph.c
===================================================================
--- branches/soc-2011-tomato/source/blender/blenkernel/intern/depsgraph.c 2011-10-19 19:15:35 UTC (rev 41119)
+++ branches/soc-2011-tomato/source/blender/blenkernel/intern/depsgraph.c 2011-10-19 21:37:07 UTC (rev 41120)
@@ -1982,7 +1982,7 @@
if(node->id==(ID *)sce) {
SceneRenderLayer *srl= BLI_findlink(&sce->r.layers, node->custom1);
if(srl && (srl->lay & lay_changed))
- NodeTagChanged(sce->nodetree, node);
+ nodeUpdate(sce->nodetree, node);
}
}
}
Modified: branches/soc-2011-tomato/source/blender/blenkernel/intern/image.c
===================================================================
--- branches/soc-2011-tomato/source/blender/blenkernel/intern/image.c 2011-10-19 19:15:35 UTC (rev 41119)
+++ branches/soc-2011-tomato/source/blender/blenkernel/intern/image.c 2011-10-19 21:37:07 UTC (rev 41120)
@@ -1514,7 +1514,7 @@
Scene *scene;
for(scene= G.main->scene.first; scene; scene= scene->id.next) {
if(scene->nodetree) {
- NodeTagIDChanged(scene->nodetree, &ima->id);
+ nodeUpdateID(scene->nodetree, &ima->id);
}
}
}
Modified: branches/soc-2011-tomato/source/blender/blenkernel/intern/node.c
===================================================================
--- branches/soc-2011-tomato/source/blender/blenkernel/intern/node.c 2011-10-19 19:15:35 UTC (rev 41119)
+++ branches/soc-2011-tomato/source/blender/blenkernel/intern/node.c 2011-10-19 21:37:07 UTC (rev 41120)
@@ -184,7 +184,7 @@
else if (in_out==SOCK_OUT)
BLI_addtail(&node->outputs, sock);
- ntree->update |= NTREE_UPDATE_NODES;
+ node->update |= NODE_UPDATE;
return sock;
}
@@ -197,7 +197,7 @@
else if (in_out==SOCK_OUT)
BLI_insertlinkbefore(&node->outputs, next_sock, sock);
- ntree->update |= NTREE_UPDATE_NODES;
+ node->update |= NODE_UPDATE;
return sock;
}
@@ -221,7 +221,7 @@
MEM_freeN(sock->default_value);
MEM_freeN(sock);
- ntree->update |= NTREE_UPDATE_NODES;
+ node->update |= NODE_UPDATE;
}
void nodeRemoveAllSockets(bNodeTree *ntree, bNode *node)
@@ -246,7 +246,7 @@
BLI_freelistN(&node->outputs);
- ntree->update |= NTREE_UPDATE_NODES;
+ node->update |= NODE_UPDATE;
}
/* finds a node based on its name */
@@ -823,7 +823,7 @@
if(link->fromnode==node) {
lb= &node->outputs;
if (link->tonode)
- NodeTagChanged(ntree, link->tonode);
+ link->tonode->update |= NODE_UPDATE;
}
else if(link->tonode==node)
lb= &node->inputs;
@@ -1495,18 +1495,19 @@
/* update individual nodes */
for (n=0; n < totnodes; ++n) {
node = deplist[n];
- if (ntreetype->update_node)
- ntreetype->update_node(ntree, node);
- else if (node->typeinfo->updatefunc)
- node->typeinfo->updatefunc(ntree, node);
+
+ /* node tree update tags override individual node update flags */
+ if ((node->update & NODE_UPDATE) || (ntree->update & NTREE_UPDATE)) {
+ if (ntreetype->update_node)
+ ntreetype->update_node(ntree, node);
+ else if (node->typeinfo->updatefunc)
+ node->typeinfo->updatefunc(ntree, node);
+ }
+ /* clear update flag */
+ node->update = 0;
}
MEM_freeN(deplist);
-
- /* ensures only a single output node is enabled, texnode allows multiple though */
- if(ntree->type!=NTREE_TEXTURE)
- ntreeSetOutput(ntree);
-
}
/* general tree updates */
@@ -1518,6 +1519,9 @@
if (ntreetype->update)
ntreetype->update(ntree);
else {
+ /* Trees can be associated with a specific node type (i.e. group nodes),
+ * in that case a tree update function may be defined by that node type.
+ */
bNodeType *ntype= node_get_type(ntree, ntree->nodetype);
if (ntype && ntype->updatetreefunc)
ntype->updatetreefunc(ntree);
@@ -1530,24 +1534,24 @@
ntree->update = 0;
}
-void NodeTagChanged(bNodeTree *ntree, bNode *node)
+void nodeUpdate(bNodeTree *ntree, bNode *node)
{
- bNodeTreeType *ntreetype = ntreeGetType(ntree->type);
+ bNodeTreeType *ntreetype= ntreeGetType(ntree->type);
- /* extra null pointer checks here because this is called when unlinking
- unknown nodes on file load, so typeinfo pointers may not be set */
- if (ntreetype && ntreetype->update_node)
+ if (ntreetype->update_node)
ntreetype->update_node(ntree, node);
- else if (node->typeinfo && node->typeinfo->updatefunc)
+ else if (node->typeinfo->updatefunc)
node->typeinfo->updatefunc(ntree, node);
+ /* clear update flag */
+ node->update = 0;
}
-int NodeTagIDChanged(bNodeTree *ntree, ID *id)
+int nodeUpdateID(bNodeTree *ntree, ID *id)
{
bNodeTreeType *ntreetype;
bNode *node;
int change = FALSE;
-
+
if(ELEM(NULL, id, ntree))
return change;
@@ -1558,6 +1562,8 @@
if(node->id==id) {
change = TRUE;
ntreetype->update_node(ntree, node);
+ /* clear update flag */
+ node->update = 0;
}
}
}
@@ -1567,6 +1573,8 @@
change = TRUE;
if (node->typeinfo->updatefunc)
node->typeinfo->updatefunc(ntree, node);
+ /* clear update flag */
+ node->update = 0;
}
}
}
Modified: branches/soc-2011-tomato/source/blender/blenloader/intern/readfile.c
===================================================================
--- branches/soc-2011-tomato/source/blender/blenloader/intern/readfile.c 2011-10-19 19:15:35 UTC (rev 41119)
+++ branches/soc-2011-tomato/source/blender/blenloader/intern/readfile.c 2011-10-19 21:37:07 UTC (rev 41120)
@@ -10356,8 +10356,7 @@
{
if(scene->ed && scene->ed->seqbasep)
{
- for(seq = scene->ed->seqbasep->first; seq; seq = seq->next)
- {
+ SEQ_BEGIN(scene->ed, seq) {
if(seq->type == SEQ_HD_SOUND)
{
char str[FILE_MAX];
@@ -10377,6 +10376,7 @@
seq->strip->dir);
}
}
+ SEQ_END
}
}
Modified: branches/soc-2011-tomato/source/blender/editors/render/render_internal.c
===================================================================
--- branches/soc-2011-tomato/source/blender/editors/render/render_internal.c 2011-10-19 19:15:35 UTC (rev 41119)
+++ branches/soc-2011-tomato/source/blender/editors/render/render_internal.c 2011-10-19 21:37:07 UTC (rev 41120)
@@ -398,13 +398,13 @@
ED_update_for_newframe(G.main, rj->scene, rj->win->screen, 1);
/* XXX above function sets all tags in nodes */
- ntreeClearTags(rj->scene->nodetree);
+ ntreeCompositClearTags(rj->scene->nodetree);
/* potentially set by caller */
rj->scene->r.scemode &= ~R_NO_FRAME_UPDATE;
if(rj->srl) {
- NodeTagIDChanged(rj->scene->nodetree, &rj->scene->id);
+ nodeUpdateID(rj->scene->nodetree, &rj->scene->id);
WM_main_add_notifier(NC_NODE|NA_EDITED, rj->scene);
}
Modified: branches/soc-2011-tomato/source/blender/editors/space_node/node_draw.c
===================================================================
--- branches/soc-2011-tomato/source/blender/editors/space_node/node_draw.c 2011-10-19 19:15:35 UTC (rev 41119)
+++ branches/soc-2011-tomato/source/blender/editors/space_node/node_draw.c 2011-10-19 21:37:07 UTC (rev 41120)
@@ -102,12 +102,12 @@
WM_main_add_notifier(NC_MATERIAL|ND_SHADING_DRAW, id);
}
else if(treetype==NTREE_COMPOSIT) {
- NodeTagChanged(edittree, node);
+ nodeUpdate(edittree, node);
/* don't use NodeTagIDChanged, it gives far too many recomposites for image, scene layers, ... */
node= node_tree_get_editgroup(nodetree);
if(node)
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list