diff options
author | Campbell Barton <ideasman42@gmail.com> | 2012-09-09 04:00:21 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2012-09-09 04:00:21 +0400 |
commit | aa2d84da37c909fa6b0ed03b54b0a3bc880f00a6 (patch) | |
tree | 0697e5957230bc6ff2ff48e9190e844e6853ea6c /source/blender/editors/space_logic/logic_window.c | |
parent | 693ceacc86786003dbe165fda985dd1f4911bd07 (diff) |
style cleanup:
also remove some redundant conversions int -> short -> int
Diffstat (limited to 'source/blender/editors/space_logic/logic_window.c')
-rw-r--r-- | source/blender/editors/space_logic/logic_window.c | 24 |
1 files changed, 17 insertions, 7 deletions
diff --git a/source/blender/editors/space_logic/logic_window.c b/source/blender/editors/space_logic/logic_window.c index 12823de60d2..a042145309d 100644 --- a/source/blender/editors/space_logic/logic_window.c +++ b/source/blender/editors/space_logic/logic_window.c @@ -878,7 +878,7 @@ static ID **get_selected_and_linked_obs(bContext *C, short *count, short scavisf } /* 4th case: select actuator when controller selected */ - if ( (scavisflag & (BUTS_ACT_LINK|BUTS_ACT_STATE)) && (ob->scavisflag & OB_VIS_CONT)) { + if ((scavisflag & (BUTS_ACT_LINK|BUTS_ACT_STATE)) && (ob->scavisflag & OB_VIS_CONT)) { cont= ob->controllers.first; while (cont) { for (a=0; a<cont->totlinks; a++) { @@ -921,7 +921,7 @@ static ID **get_selected_and_linked_obs(bContext *C, short *count, short scavisf } while (ob) { - if ( (ob->scavisflag) && (ob != obact)) { + if ((ob->scavisflag) && (ob != obact)) { idar[nr]= (ID *)ob; nr++; } @@ -4539,7 +4539,9 @@ static void logic_buttons_new(bContext *C, ARegion *ar) ob= (Object *)idar[a]; /* only draw the controller common header if "use_visible" */ - if ( (ob->scavisflag & OB_VIS_CONT) == 0) continue; + if ( (ob->scavisflag & OB_VIS_CONT) == 0) { + continue; + } /* Drawing the Controller Header common to all Selected Objects */ @@ -4707,7 +4709,9 @@ static void logic_buttons_new(bContext *C, ARegion *ar) ob= (Object *)idar[a]; /* only draw the actuator common header if "use_visible" */ - if ( (ob->scavisflag & OB_VIS_ACT) == 0) continue; + if ((ob->scavisflag & OB_VIS_ACT) == 0) { + continue; + } row = uiLayoutRow(layout, TRUE); uiDefButBitS(block, TOG, OB_SHOWACT, B_REDR, ob->id.name+2, (short)(xco-10), yco, (short)(width-30), UI_UNIT_Y, &ob->scaflag, 0, 31, 0, 0, "Object name, click to show/hide actuators"); @@ -4834,7 +4838,9 @@ void logic_buttons(bContext *C, ARegion *ar) ob= (Object *)idar[a]; // uiClearButLock(); // uiSetButLock(BKE_object_is_libdata(ob), ERROR_LIBDATA_MESSAGE); - if ( (ob->scavisflag & OB_VIS_CONT) == 0) continue; + if ((ob->scavisflag & OB_VIS_CONT) == 0) { + continue; + } /* presume it is only objects for now */ uiBlockBeginAlign(block); @@ -4972,7 +4978,9 @@ void logic_buttons(bContext *C, ARegion *ar) // uiClearButLock(); // uiSetButLock(BKE_object_is_libdata(ob), ERROR_LIBDATA_MESSAGE); - if ( (ob->scavisflag & OB_VIS_SENS) == 0) continue; + if ((ob->scavisflag & OB_VIS_SENS) == 0) { + continue; + } /* presume it is only objects for now */ uiBlockBeginAlign(block); @@ -5052,7 +5060,9 @@ void logic_buttons(bContext *C, ARegion *ar) ob= (Object *)idar[a]; // uiClearButLock(); // uiSetButLock(BKE_object_is_libdata(ob), ERROR_LIBDATA_MESSAGE); - if ( (ob->scavisflag & OB_VIS_ACT) == 0) continue; + if ((ob->scavisflag & OB_VIS_ACT) == 0) { + continue; + } /* presume it is only objects for now */ uiBlockBeginAlign(block); |