[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [49400] branches/soc-2011-tomato: Merging r49390 through r49399 from trunk into soc-2011-tomato
Sergey Sharybin
sergey.vfx at gmail.com
Mon Jul 30 18:40:23 CEST 2012
Revision: 49400
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=49400
Author: nazgul
Date: 2012-07-30 16:40:23 +0000 (Mon, 30 Jul 2012)
Log Message:
-----------
Merging r49390 through r49399 from trunk into soc-2011-tomato
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=49390
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=49399
Modified Paths:
--------------
branches/soc-2011-tomato/doc/python_api/sphinx_doc_gen.py
branches/soc-2011-tomato/source/blender/blenkernel/intern/mesh.c
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_MuteNode.cpp
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_MuteNode.h
Property Changed:
----------------
branches/soc-2011-tomato/
branches/soc-2011-tomato/source/blender/editors/interface/interface.c
branches/soc-2011-tomato/source/blender/editors/space_outliner/
Property changes on: branches/soc-2011-tomato
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/ge_harmony:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/branches/soc-2011-cucumber:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/vgroup_modifiers:38694-39989
/trunk/blender:36831-49389
+ /branches/ge_harmony:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/branches/soc-2011-cucumber:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/vgroup_modifiers:38694-39989
/trunk/blender:36831-49399
Modified: branches/soc-2011-tomato/doc/python_api/sphinx_doc_gen.py
===================================================================
--- branches/soc-2011-tomato/doc/python_api/sphinx_doc_gen.py 2012-07-30 16:39:39 UTC (rev 49399)
+++ branches/soc-2011-tomato/doc/python_api/sphinx_doc_gen.py 2012-07-30 16:40:23 UTC (rev 49400)
@@ -971,6 +971,7 @@
"meta_ball": ("MetaBall", False),
"object": ("Object", False),
"particle_edit_object": ("Object", False),
+ "particle_settings": ("ParticleSettings", False),
"particle_system": ("ParticleSystem", False),
"particle_system_editable": ("ParticleSystem", False),
"pose_bone": ("PoseBone", False),
Modified: branches/soc-2011-tomato/source/blender/blenkernel/intern/mesh.c
===================================================================
--- branches/soc-2011-tomato/source/blender/blenkernel/intern/mesh.c 2012-07-30 16:39:39 UTC (rev 49399)
+++ branches/soc-2011-tomato/source/blender/blenkernel/intern/mesh.c 2012-07-30 16:40:23 UTC (rev 49400)
@@ -1536,7 +1536,7 @@
void BKE_mesh_from_nurbs(Object *ob)
{
- return BKE_mesh_from_nurbs_displist(ob, &ob->disp);
+ BKE_mesh_from_nurbs_displist(ob, &ob->disp);
}
typedef struct EdgeLink {
Modified: branches/soc-2011-tomato/source/blender/compositor/nodes/COM_MuteNode.cpp
===================================================================
--- branches/soc-2011-tomato/source/blender/compositor/nodes/COM_MuteNode.cpp 2012-07-30 16:39:39 UTC (rev 49399)
+++ branches/soc-2011-tomato/source/blender/compositor/nodes/COM_MuteNode.cpp 2012-07-30 16:40:23 UTC (rev 49400)
@@ -47,7 +47,12 @@
}
}
}
-
+
+ createDefaultOutput(graph, output);
+}
+
+void MuteNode::createDefaultOutput(ExecutionSystem *graph, OutputSocket *output)
+{
NodeOperation *operation = NULL;
switch (output->getDataType()) {
case COM_DT_VALUE:
@@ -100,7 +105,10 @@
bNode *editorNode = this->getbNode();
vector<OutputSocket *> &outputsockets = this->getOutputSockets();
- if (editorNode->typeinfo->internal_connect) {
+ /* mute node is also used for unknown nodes and couple of nodes in fast mode
+ * can't use generic routines in that case
+ */
+ if ((editorNode->flag & NODE_MUTED) && editorNode->typeinfo->internal_connect) {
vector<InputSocket *> &inputsockets = this->getInputSockets();
bNodeTree *editorTree = (bNodeTree *) context->getbNodeTree();
SocketMap socketMap;
@@ -117,7 +125,14 @@
InputSocket *fromSocket = (InputSocket *) socketMap.find(link->fromsock)->second;
OutputSocket *toSocket = (OutputSocket *) socketMap.find(link->tosock)->second;
- toSocket->relinkConnections(fromSocket->getConnection()->getFromSocket(), false);
+ if (toSocket->isConnected()) {
+ if (fromSocket->isConnected()) {
+ toSocket->relinkConnections(fromSocket->getConnection()->getFromSocket(), false);
+ }
+ else {
+ createDefaultOutput(graph, toSocket);
+ }
+ }
}
}
Modified: branches/soc-2011-tomato/source/blender/compositor/nodes/COM_MuteNode.h
===================================================================
--- branches/soc-2011-tomato/source/blender/compositor/nodes/COM_MuteNode.h 2012-07-30 16:39:39 UTC (rev 49399)
+++ branches/soc-2011-tomato/source/blender/compositor/nodes/COM_MuteNode.h 2012-07-30 16:40:23 UTC (rev 49400)
@@ -43,6 +43,7 @@
typedef std::map<bNodeSocket *, Socket *> SocketMap;
void reconnect(ExecutionSystem *graph, OutputSocket *output);
+ void createDefaultOutput(ExecutionSystem *graph, OutputSocket *output);
template<class SocketType> void fillSocketMap(vector<SocketType *> &sockets, SocketMap &socketMap);
};
Property changes on: branches/soc-2011-tomato/source/blender/editors/interface/interface.c
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/ge_candy/source/blender/editors/interface/interface.c:45070-46163
/branches/ge_harmony/source/blender/editors/interface/interface.c:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/branches/soc-2011-cucumber/source/blender/editors/interface/interface.c:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/vgroup_modifiers/source/blender/editors/interface/interface.c:38694-39989
/trunk/blender/source/blender/editors/interface/interface.c:36831-49389
+ /branches/ge_candy/source/blender/editors/interface/interface.c:45070-46163
/branches/ge_harmony/source/blender/editors/interface/interface.c:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/branches/soc-2011-cucumber/source/blender/editors/interface/interface.c:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/vgroup_modifiers/source/blender/editors/interface/interface.c:38694-39989
/trunk/blender/source/blender/editors/interface/interface.c:36831-49399
Property changes on: branches/soc-2011-tomato/source/blender/editors/space_outliner
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/soc-2011-cucumber/source/blender/editors/space_outliner:38968,38970,38973,39045,40845
/branches/soc-2011-pepper/source/blender/editors/space_outliner:36831-38987
/trunk/blender/source/blender/editors/space_outliner:36831-49389
+ /branches/soc-2011-cucumber/source/blender/editors/space_outliner:38968,38970,38973,39045,40845
/branches/soc-2011-pepper/source/blender/editors/space_outliner:36831-38987
/trunk/blender/source/blender/editors/space_outliner:36831-49399
More information about the Bf-blender-cvs
mailing list