Commit: a1cab0d38d178895127ba8d5160c8282938a2467
Author: Campbell Barton
Date: Thu Apr 17 20:00:49 2014 +1000
https://developer.blender.org/rBa1cab0d38d178895127ba8d5160c8282938a2467
Style cleanup
===================================================================
M source/blender/compositor/intern/COM_NodeOperationBuilder.cpp
M source/blender/editors/interface/interface.c
===================================================================
diff --git a/source/blender/compositor/intern/COM_NodeOperationBuilder.cpp
b/source/blender/compositor/intern/COM_NodeOperationBuilder.cpp
index 2807c25..fdea320 100644
--- a/source/blender/compositor/intern/COM_NodeOperationBuilder.cpp
+++ b/source/blender/compositor/intern/COM_NodeOperationBuilder.cpp
@@ -333,7 +333,8 @@ void NodeOperationBuilder::resolve_proxies()
const Link &link = *it;
/* don't replace links from proxy to proxy, since we may need
them for replacing others! */
if (link.from()->getOperation().isProxyOperation() &&
- !link.to()->getOperation().isProxyOperation()) {
+ !link.to()->getOperation().isProxyOperation())
+ {
proxy_links.push_back(link);
}
}
diff --git a/source/blender/editors/interface/interface.c
b/source/blender/editors/interface/interface.c
index b7e2034..691c510 100644
--- a/source/blender/editors/interface/interface.c
+++ b/source/blender/editors/interface/interface.c
@@ -1400,7 +1400,7 @@ void uiComposeLinks(uiBlock *block)
for (a = 0; a < *(link->totlink); a++) {
bt = ui_find_inlink(block,
(*ppoin)[a]);
if (bt) {
- if ((but->flag &
UI_BUT_SCA_LINK_GREY) || (bt->flag & UI_BUT_SCA_LINK_GREY)){
+ if ((but->flag &
UI_BUT_SCA_LINK_GREY) || (bt->flag & UI_BUT_SCA_LINK_GREY)) {
ui_add_link_line(&link->lines, but, bt, true);
}
else {
@@ -1413,7 +1413,7 @@ void uiComposeLinks(uiBlock *block)
else if (link->poin) {
bt = ui_find_inlink(block,
*(link->poin) );
if (bt) {
- if ((but->flag &
UI_BUT_SCA_LINK_GREY) || (bt->flag & UI_BUT_SCA_LINK_GREY)){
+ if ((but->flag &
UI_BUT_SCA_LINK_GREY) || (bt->flag & UI_BUT_SCA_LINK_GREY)) {
ui_add_link_line(&link->lines, but, bt, true);
}
else {
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
