Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2014-04-17 14:00:49 +0400
committerCampbell Barton <ideasman42@gmail.com>2014-04-17 14:03:39 +0400
commita1cab0d38d178895127ba8d5160c8282938a2467 (patch)
treeb33098dd42475bbe75c822f389c3e5f347fe4bbb
parent1c0b6c4f30d2e7e2c32f4b6165c52d18572ce8ab (diff)
Style cleanup
-rw-r--r--source/blender/compositor/intern/COM_NodeOperationBuilder.cpp3
-rw-r--r--source/blender/editors/interface/interface.c4
2 files changed, 4 insertions, 3 deletions
diff --git a/source/blender/compositor/intern/COM_NodeOperationBuilder.cpp b/source/blender/compositor/intern/COM_NodeOperationBuilder.cpp
index 2807c25d7f5..fdea3206d8e 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 b7e203408d2..691c5104cc1 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 {