Revision: 47668
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=47668
Author: nazgul
Date: 2012-06-10 12:15:39 +0000 (Sun, 10 Jun 2012)
Log Message:
-----------
Merging r47662 through r47666 from trunk into soc-2011-tomato
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=47662
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=47666
Modified Paths:
--------------
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_GroupNode.cpp
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_SocketProxyNode.cpp
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_SocketProxyNode.h
branches/soc-2011-tomato/source/blender/editors/space_view3d/drawarmature.c
branches/soc-2011-tomato/source/blender/editors/space_view3d/drawobject.c
branches/soc-2011-tomato/source/blender/editors/space_view3d/view3d_draw.c
branches/soc-2011-tomato/source/blender/editors/space_view3d/view3d_intern.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-47661
+
/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-47666
Modified:
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_GroupNode.cpp
===================================================================
--- branches/soc-2011-tomato/source/blender/compositor/nodes/COM_GroupNode.cpp
2012-06-10 12:09:25 UTC (rev 47667)
+++ branches/soc-2011-tomato/source/blender/compositor/nodes/COM_GroupNode.cpp
2012-06-10 12:15:39 UTC (rev 47668)
@@ -45,23 +45,16 @@
InputSocket * inputSocket = inputsockets[index];
bNodeSocket *editorInput = inputSocket->getbNodeSocket();
if (editorInput->groupsock) {
- if (inputSocket->isConnected()) {
- SocketProxyNode * proxy = new
SocketProxyNode(this->getbNode(), editorInput, editorInput->groupsock);
-
inputSocket->relinkConnections(proxy->getInputSocket(0), index, &system);
-
ExecutionSystemHelper::addNode(system.getNodes(), proxy);
- }
- else {
- OutputSocketProxyNode * proxy = new
OutputSocketProxyNode(this->getbNode(), editorInput, editorInput->groupsock);
-
inputSocket->relinkConnections(proxy->getInputSocket(0), index, &system);
-
ExecutionSystemHelper::addNode(system.getNodes(), proxy);
- }
+ SocketProxyNode * proxy = new
SocketProxyNode(this->getbNode(), editorInput, editorInput->groupsock);
+
inputSocket->relinkConnections(proxy->getInputSocket(0), index, &system);
+ ExecutionSystemHelper::addNode(system.getNodes(),
proxy);
}
}
for (index = 0 ; index < outputsockets.size();index ++) {
OutputSocket * outputSocket = outputsockets[index];
bNodeSocket *editorOutput = outputSocket->getbNodeSocket();
- if (outputSocket->isConnected() && editorOutput->groupsock) {
+ if (editorOutput->groupsock) {
SocketProxyNode * proxy = new
SocketProxyNode(this->getbNode(), editorOutput->groupsock, editorOutput);
outputSocket->relinkConnections(proxy->getOutputSocket(0));
ExecutionSystemHelper::addNode(system.getNodes(),
proxy);
Modified:
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_SocketProxyNode.cpp
===================================================================
---
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_SocketProxyNode.cpp
2012-06-10 12:09:25 UTC (rev 47667)
+++
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_SocketProxyNode.cpp
2012-06-10 12:15:39 UTC (rev 47668)
@@ -46,50 +46,48 @@
void SocketProxyNode::convertToOperations(ExecutionSystem *graph,
CompositorContext * context)
{
OutputSocket * outputsocket = this->getOutputSocket(0);
- if (outputsocket->isConnected()) {
- SocketProxyOperation *operation = new SocketProxyOperation();
-
this->getInputSocket(0)->relinkConnections(operation->getInputSocket(0));
-
this->getOutputSocket(0)->relinkConnections(operation->getOutputSocket(0));
- graph->addOperation(operation);
- }
-}
-
-void OutputSocketProxyNode::convertToOperations(ExecutionSystem *graph,
CompositorContext * context)
-{
- OutputSocket * outputsocket = this->getOutputSocket(0);
InputSocket * inputsocket = this->getInputSocket(0);
if (outputsocket->isConnected()) {
- switch (outputsocket->getActualDataType()) {
- case COM_DT_VALUE:
- {
- SetValueOperation *operation = new SetValueOperation();
- bNodeSocketValueFloat *dval =
(bNodeSocketValueFloat*)inputsocket->getbNodeSocket()->default_value;
- operation->setValue(dval->value);
-
this->getOutputSocket(0)->relinkConnections(operation->getOutputSocket(0));
+ if (inputsocket->isConnected()) {
+ SocketProxyOperation *operation = new
SocketProxyOperation();
+
inputsocket->relinkConnections(operation->getInputSocket(0));
+
outputsocket->relinkConnections(operation->getOutputSocket(0));
graph->addOperation(operation);
- break;
}
- case COM_DT_COLOR:
- {
- SetColorOperation *operation = new SetColorOperation();
- bNodeSocketValueRGBA *dval =
(bNodeSocketValueRGBA*)inputsocket->getbNodeSocket()->default_value;
- operation->setChannels(dval->value);
-
this->getOutputSocket(0)->relinkConnections(operation->getOutputSocket(0));
- graph->addOperation(operation);
- break;
+ else {
+ /* If input is not connected, add a constant value
operation instead */
+ switch (outputsocket->getActualDataType()) {
+ case COM_DT_VALUE:
+ {
+ SetValueOperation *operation = new
SetValueOperation();
+ bNodeSocketValueFloat *dval =
(bNodeSocketValueFloat*)inputsocket->getbNodeSocket()->default_value;
+ operation->setValue(dval->value);
+
outputsocket->relinkConnections(operation->getOutputSocket(0));
+ graph->addOperation(operation);
+ break;
+ }
+ case COM_DT_COLOR:
+ {
+ SetColorOperation *operation = new
SetColorOperation();
+ bNodeSocketValueRGBA *dval =
(bNodeSocketValueRGBA*)inputsocket->getbNodeSocket()->default_value;
+ operation->setChannels(dval->value);
+
outputsocket->relinkConnections(operation->getOutputSocket(0));
+ graph->addOperation(operation);
+ break;
+ }
+ case COM_DT_VECTOR:
+ {
+ SetVectorOperation *operation = new
SetVectorOperation();
+ bNodeSocketValueVector *dval =
(bNodeSocketValueVector*)inputsocket->getbNodeSocket()->default_value;
+ operation->setVector(dval->value);
+
outputsocket->relinkConnections(operation->getOutputSocket(0));
+ graph->addOperation(operation);
+ break;
+ }
+ /* quiet warnings */
+ case COM_DT_UNKNOWN:
+ break;
+ }
}
- case COM_DT_VECTOR:
- {
- SetVectorOperation *operation = new
SetVectorOperation();
- bNodeSocketValueVector *dval =
(bNodeSocketValueVector*)inputsocket->getbNodeSocket()->default_value;
- operation->setVector(dval->value);
-
this->getOutputSocket(0)->relinkConnections(operation->getOutputSocket(0));
- graph->addOperation(operation);
- break;
- }
- /* quiet warnings */
- case COM_DT_UNKNOWN:
- break;
- }
}
}
Modified:
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_SocketProxyNode.h
===================================================================
---
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_SocketProxyNode.h
2012-06-10 12:09:25 UTC (rev 47667)
+++
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_SocketProxyNode.h
2012-06-10 12:15:39 UTC (rev 47668)
@@ -37,10 +37,4 @@
virtual bool isProxyNode() const { return true; }
};
-class OutputSocketProxyNode: public SocketProxyNode {
-public:
- OutputSocketProxyNode(bNode *editorNode, bNodeSocket *editorInput,
bNodeSocket *editorOutput): SocketProxyNode(editorNode, editorInput,
editorOutput) {}
- void convertToOperations(ExecutionSystem *graph, CompositorContext *
context);
-};
-
#endif
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-47661
+ /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-47666
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-47661
+
/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-47666
Modified:
branches/soc-2011-tomato/source/blender/editors/space_view3d/drawarmature.c
===================================================================
--- branches/soc-2011-tomato/source/blender/editors/space_view3d/drawarmature.c
2012-06-10 12:09:25 UTC (rev 47667)
+++ branches/soc-2011-tomato/source/blender/editors/space_view3d/drawarmature.c
2012-06-10 12:15:39 UTC (rev 47668)
@@ -557,7 +557,7 @@
/* *************** Armature drawing, bones ******************* */
-static void draw_bone_points(int dt, int armflag, unsigned int boneflag, int
id)
+static void draw_bone_points(const short dt, int armflag, unsigned int
boneflag, int id)
{
/* Draw root point if we are not connected */
if ((boneflag & BONE_CONNECTED) == 0) {
@@ -862,7 +862,7 @@
}
/* does wire only for outline selecting */
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
