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:
authorSebastian Parborg <darkdefende@gmail.com>2020-07-03 22:22:41 +0300
committerSebastian Parborg <darkdefende@gmail.com>2020-07-03 22:23:33 +0300
commitd7dbf90a0252ae09649b9033d1f199fa6acd8d07 (patch)
treeb968d8183fe6456dcfe42f6587cc786c90d56182 /source/blender/editors/animation
parent185fe9cd8bb177070ce8aecaa036d9880cce380e (diff)
Clang-tidy: Enable braces-around-statements warning
Diffstat (limited to 'source/blender/editors/animation')
-rw-r--r--source/blender/editors/animation/anim_channels_defines.c12
-rw-r--r--source/blender/editors/animation/anim_filter.c9
2 files changed, 14 insertions, 7 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);