blender
/
blender
132
398
Fork 577
Code Issues 6.2k Pull Requests 744 Projects 19 Wiki Activity

Style cleanup

This commit is contained in:
Campbell Barton 2014-04-17 20:00:49 +10:00
parent 1c0b6c4f30
commit a1cab0d38d
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
source/blender/compositor/intern/COM_NodeOperationBuilder.cpp
View File

@ -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);
}
}

4
source/blender/editors/interface/interface.c
View File

@ -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 {