[Bf-blender-cvs] [1961c61d203] master: ClangFormat: re-run (#if 0 caused noise)

[Campbell Barton]

Commit: 1961c61d2033b301ffcaf22ac3bfbe3852a6a4f4
Author: Campbell Barton
Date:   Wed Apr 17 09:34:15 2019 +0200
Branches: master
https://developer.blender.org/rB1961c61d2033b301ffcaf22ac3bfbe3852a6a4f4

ClangFormat: re-run (#if 0 caused noise)

===================================================================

M	source/blender/blenkernel/intern/sound.c
M	source/blender/makesrna/intern/rna_curve.c
M	source/blender/makesrna/intern/rna_fcurve.c
M	source/blender/makesrna/intern/rna_userdef.c

===================================================================

diff --git a/source/blender/blenkernel/intern/sound.c b/source/blender/blenkernel/intern/sound.c
index b521aa2f954..118d307eb7c 100644
--- a/source/blender/blenkernel/intern/sound.c
+++ b/source/blender/blenkernel/intern/sound.c
@@ -394,23 +394,23 @@ void BKE_sound_load(struct Main *bmain, bSound *sound)
     switch (sound->type) {
       case SOUND_TYPE_FILE:
 #  endif
-      {
-        char fullpath[FILE_MAX];
-
-        /* load sound */
-        PackedFile *pf = sound->packedfile;
-
-        /* don't modify soundact->sound->name, only change a copy */
-        BLI_strncpy(fullpath, sound->name, sizeof(fullpath));
-        BLI_path_abs(fullpath, ID_BLEND_PATH(bmain, &sound->id));
-
-        /* but we need a packed file then */
-        if (pf)
-          sound->handle = AUD_Sound_bufferFile((unsigned char *)pf->data, pf->size);
-        /* or else load it from disk */
-        else
-          sound->handle = AUD_Sound_file(fullpath);
-      }
+    {
+      char fullpath[FILE_MAX];
+
+      /* load sound */
+      PackedFile *pf = sound->packedfile;
+
+      /* don't modify soundact->sound->name, only change a copy */
+      BLI_strncpy(fullpath, sound->name, sizeof(fullpath));
+      BLI_path_abs(fullpath, ID_BLEND_PATH(bmain, &sound->id));
+
+      /* but we need a packed file then */
+      if (pf)
+        sound->handle = AUD_Sound_bufferFile((unsigned char *)pf->data, pf->size);
+      /* or else load it from disk */
+      else
+        sound->handle = AUD_Sound_file(fullpath);
+    }
 /* XXX unused currently */
 #  if 0
       break;
@@ -425,23 +425,23 @@ void BKE_sound_load(struct Main *bmain, bSound *sound)
       break;
   }
 #  endif
-  if (sound->flags & SOUND_FLAGS_MONO) {
-    void *handle = AUD_Sound_rechannel(sound->handle, AUD_CHANNELS_MONO);
-    AUD_Sound_free(sound->handle);
-    sound->handle = handle;
-  }
+    if (sound->flags & SOUND_FLAGS_MONO) {
+      void *handle = AUD_Sound_rechannel(sound->handle, AUD_CHANNELS_MONO);
+      AUD_Sound_free(sound->handle);
+      sound->handle = handle;
+    }
 
-  if (sound->flags & SOUND_FLAGS_CACHING) {
-    sound->cache = AUD_Sound_cache(sound->handle);
-  }
+    if (sound->flags & SOUND_FLAGS_CACHING) {
+      sound->cache = AUD_Sound_cache(sound->handle);
+    }
 
-  if (sound->cache)
-    sound->playback_handle = sound->cache;
-  else
-    sound->playback_handle = sound->handle;
+    if (sound->cache)
+      sound->playback_handle = sound->cache;
+    else
+      sound->playback_handle = sound->handle;
 
-  BKE_sound_update_sequencer(bmain, sound);
-}
+    BKE_sound_update_sequencer(bmain, sound);
+  }
 }
 
 AUD_Device *BKE_sound_mixdown(struct Scene *scene, AUD_DeviceSpecs specs, int start, float volume)
diff --git a/source/blender/makesrna/intern/rna_curve.c b/source/blender/makesrna/intern/rna_curve.c
index 2e021d7ae15..7afc0ca6eae 100644
--- a/source/blender/makesrna/intern/rna_curve.c
+++ b/source/blender/makesrna/intern/rna_curve.c
@@ -1315,7 +1315,7 @@ static void rna_def_charinfo(BlenderRNA *brna)
   * /
 #  endif
 
-      prop = RNA_def_property(srna, "use_small_caps", PROP_BOOLEAN, PROP_NONE);
+  prop = RNA_def_property(srna, "use_small_caps", PROP_BOOLEAN, PROP_NONE);
   RNA_def_property_boolean_sdna(prop, NULL, "flag", CU_CHINFO_SMALLCAPS);
   RNA_def_property_ui_text(prop, "Small Caps", "");
   RNA_def_property_ui_icon(prop, ICON_SMALL_CAPS, 0);
diff --git a/source/blender/makesrna/intern/rna_fcurve.c b/source/blender/makesrna/intern/rna_fcurve.c
index f4026b5025c..1e1883a4a39 100644
--- a/source/blender/makesrna/intern/rna_fcurve.c
+++ b/source/blender/makesrna/intern/rna_fcurve.c
@@ -1518,12 +1518,12 @@ static void rna_def_fmodifier(BlenderRNA *brna)
   RNA_def_struct_refine_func(srna, "rna_FModifierType_refine");
   RNA_def_struct_ui_text(srna, "F-Modifier", "Modifier for values of F-Curve");
 
-#  if 0 /* XXX not used yet */
+#  if 0  /* XXX not used yet */
   /* name */
   prop = RNA_def_property(srna, "name", PROP_STRING, PROP_NONE);
   RNA_def_struct_name_property(srna, prop);
   RNA_def_property_ui_text(prop, "Name", "Short description of F-Curve Modifier");
-#  endif           /* XXX not used yet */
+#  endif /* XXX not used yet */
 
   /* type */
   prop = RNA_def_property(srna, "type", PROP_ENUM, PROP_NONE);
diff --git a/source/blender/makesrna/intern/rna_userdef.c b/source/blender/makesrna/intern/rna_userdef.c
index 54a880293ad..5a017e96fa7 100644
--- a/source/blender/makesrna/intern/rna_userdef.c
+++ b/source/blender/makesrna/intern/rna_userdef.c
@@ -5128,7 +5128,7 @@ static void rna_def_userdef_input(BlenderRNA *brna)
   prop = RNA_def_boolean(srna, "use_ndof", true, "", "");
 #  else
   prop = RNA_def_boolean(srna, "use_ndof", false, "", "");
-#  endif            /* WITH_INPUT_NDOF */
+#  endif /* WITH_INPUT_NDOF */
   RNA_def_property_flag(prop, PROP_IDPROPERTY);
   RNA_def_property_clear_flag(prop, PROP_EDITABLE);