diff options
Diffstat (limited to 'source/blender/editors')
5 files changed, 36 insertions, 18 deletions
diff --git a/source/blender/editors/animation/anim_channels_defines.c b/source/blender/editors/animation/anim_channels_defines.c index 843b8400a32..79c465c1f33 100644 --- a/source/blender/editors/animation/anim_channels_defines.c +++ b/source/blender/editors/animation/anim_channels_defines.c @@ -2842,8 +2842,9 @@ static void *acf_dshair_setting_ptr(bAnimListElem *ale, eAnimChannel_Settings se case ACHANNEL_SETTING_SELECT: /* selected */ case ACHANNEL_SETTING_MUTE: /* muted (for NLA only) */ case ACHANNEL_SETTING_VISIBLE: /* visible (for Graph Editor only) */ - if (hair->adt) + if (hair->adt) { return GET_ACF_FLAG_PTR(hair->adt->flag, type); + } return NULL; default: /* unsupported */ @@ -2922,8 +2923,9 @@ static void *acf_dspointcloud_setting_ptr(bAnimListElem *ale, case ACHANNEL_SETTING_SELECT: /* selected */ case ACHANNEL_SETTING_MUTE: /* muted (for NLA only) */ case ACHANNEL_SETTING_VISIBLE: /* visible (for Graph Editor only) */ - if (pointcloud->adt) + if (pointcloud->adt) { return GET_ACF_FLAG_PTR(pointcloud->adt->flag, type); + } return NULL; default: /* unsupported */ @@ -3002,8 +3004,9 @@ static void *acf_dsvolume_setting_ptr(bAnimListElem *ale, case ACHANNEL_SETTING_SELECT: /* selected */ case ACHANNEL_SETTING_MUTE: /* muted (for NLA only) */ case ACHANNEL_SETTING_VISIBLE: /* visible (for Graph Editor only) */ - if (volume->adt) + if (volume->adt) { return GET_ACF_FLAG_PTR(volume->adt->flag, type); + } return NULL; default: /* unsupported */ @@ -3080,8 +3083,9 @@ static void *acf_dssimulation_setting_ptr(bAnimListElem *ale, case ACHANNEL_SETTING_SELECT: /* selected */ case ACHANNEL_SETTING_MUTE: /* muted (for NLA only) */ case ACHANNEL_SETTING_VISIBLE: /* visible (for Graph Editor only) */ - if (simulation->adt) + if (simulation->adt) { return GET_ACF_FLAG_PTR(simulation->adt->flag, type); + } return NULL; default: /* unsupported */ diff --git a/source/blender/editors/animation/anim_filter.c b/source/blender/editors/animation/anim_filter.c index 08be6c72bbc..bbb673caa71 100644 --- a/source/blender/editors/animation/anim_filter.c +++ b/source/blender/editors/animation/anim_filter.c @@ -2601,8 +2601,9 @@ static size_t animdata_filter_ds_obdata( { Hair *hair = (Hair *)ob->data; - if (ads->filterflag2 & ADS_FILTER_NOHAIR) + if (ads->filterflag2 & ADS_FILTER_NOHAIR) { return 0; + } type = ANIMTYPE_DSHAIR; expanded = FILTER_HAIR_OBJD(hair); @@ -2612,8 +2613,9 @@ static size_t animdata_filter_ds_obdata( { PointCloud *pointcloud = (PointCloud *)ob->data; - if (ads->filterflag2 & ADS_FILTER_NOPOINTCLOUD) + if (ads->filterflag2 & ADS_FILTER_NOPOINTCLOUD) { return 0; + } type = ANIMTYPE_DSPOINTCLOUD; expanded = FILTER_POINTS_OBJD(pointcloud); @@ -2623,8 +2625,9 @@ static size_t animdata_filter_ds_obdata( { Volume *volume = (Volume *)ob->data; - if (ads->filterflag2 & ADS_FILTER_NOVOLUME) + if (ads->filterflag2 & ADS_FILTER_NOVOLUME) { return 0; + } type = ANIMTYPE_DSVOLUME; expanded = FILTER_VOLUME_OBJD(volume); diff --git a/source/blender/editors/interface/interface_templates.c b/source/blender/editors/interface/interface_templates.c index f3e2eef6f31..8f98f380854 100644 --- a/source/blender/editors/interface/interface_templates.c +++ b/source/blender/editors/interface/interface_templates.c @@ -1879,8 +1879,9 @@ void uiTemplateModifiers(uiLayout *UNUSED(layout), bContext *C) else { /* The expansion might have been changed elsewhere, so we still need to set it. */ LISTBASE_FOREACH (Panel *, panel, ®ion->panels) { - if ((panel->type != NULL) && (panel->type->flag & PNL_INSTANCED)) + if ((panel->type != NULL) && (panel->type->flag & PNL_INSTANCED)) { UI_panel_set_expand_from_list_data(C, panel); + } } /* Assuming there's only one group of instanced panels, update the custom data pointers. */ @@ -2055,8 +2056,9 @@ void uiTemplateConstraints(uiLayout *UNUSED(layout), bContext *C, bool use_bone_ else { /* The expansion might have been changed elsewhere, so we still need to set it. */ LISTBASE_FOREACH (Panel *, panel, ®ion->panels) { - if ((panel->type != NULL) && (panel->type->flag & PNL_INSTANCED)) + if ((panel->type != NULL) && (panel->type->flag & PNL_INSTANCED)) { UI_panel_set_expand_from_list_data(C, panel); + } } } } @@ -2115,8 +2117,9 @@ void uiTemplateGpencilModifiers(uiLayout *UNUSED(layout), bContext *C) else { /* The expansion might have been changed elsewhere, so we still need to set it. */ LISTBASE_FOREACH (Panel *, panel, ®ion->panels) { - if ((panel->type != NULL) && (panel->type->flag & PNL_INSTANCED)) + if ((panel->type != NULL) && (panel->type->flag & PNL_INSTANCED)) { UI_panel_set_expand_from_list_data(C, panel); + } } /* Assuming there's only one group of instanced panels, update the custom data pointers. */ @@ -2193,8 +2196,9 @@ void uiTemplateShaderFx(uiLayout *UNUSED(layout), bContext *C) else { /* The expansion might have been changed elsewhere, so we still need to set it. */ LISTBASE_FOREACH (Panel *, panel, ®ion->panels) { - if ((panel->type != NULL) && (panel->type->flag & PNL_INSTANCED)) + if ((panel->type != NULL) && (panel->type->flag & PNL_INSTANCED)) { UI_panel_set_expand_from_list_data(C, panel); + } } } } diff --git a/source/blender/editors/object/object_vgroup.c b/source/blender/editors/object/object_vgroup.c index ca5e1921595..b8dbc5c279d 100644 --- a/source/blender/editors/object/object_vgroup.c +++ b/source/blender/editors/object/object_vgroup.c @@ -1769,12 +1769,14 @@ static void vgroup_lock_all(Object *ob, int action, int mask) switch (mask) { case VGROUP_MASK_INVERT_UNSELECTED: case VGROUP_MASK_SELECTED: - if (!selected[i]) + if (!selected[i]) { continue; + } break; case VGROUP_MASK_UNSELECTED: - if (selected[i]) + if (selected[i]) { continue; + } break; default:; } @@ -1789,12 +1791,14 @@ static void vgroup_lock_all(Object *ob, int action, int mask) for (dg = ob->defbase.first, i = 0; dg; dg = dg->next, i++) { switch (mask) { case VGROUP_MASK_SELECTED: - if (!selected[i]) + if (!selected[i]) { continue; + } break; case VGROUP_MASK_UNSELECTED: - if (selected[i]) + if (selected[i]) { continue; + } break; default:; } diff --git a/source/blender/editors/space_outliner/outliner_tree.c b/source/blender/editors/space_outliner/outliner_tree.c index 544c41a3a7b..2f42f3be50c 100644 --- a/source/blender/editors/space_outliner/outliner_tree.c +++ b/source/blender/editors/space_outliner/outliner_tree.c @@ -769,20 +769,23 @@ static void outliner_add_id_contents(SpaceOutliner *soops, } case ID_HA: { Hair *hair = (Hair *)id; - if (outliner_animdata_test(hair->adt)) + if (outliner_animdata_test(hair->adt)) { outliner_add_element(soops, &te->subtree, hair, te, TSE_ANIM_DATA, 0); + } break; } case ID_PT: { PointCloud *pointcloud = (PointCloud *)id; - if (outliner_animdata_test(pointcloud->adt)) + if (outliner_animdata_test(pointcloud->adt)) { outliner_add_element(soops, &te->subtree, pointcloud, te, TSE_ANIM_DATA, 0); + } break; } case ID_VO: { Volume *volume = (Volume *)id; - if (outliner_animdata_test(volume->adt)) + if (outliner_animdata_test(volume->adt)) { outliner_add_element(soops, &te->subtree, volume, te, TSE_ANIM_DATA, 0); + } break; } case ID_SIM: { |