diff options
author | Campbell Barton <ideasman42@gmail.com> | 2019-04-17 09:50:46 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2019-04-17 09:52:59 +0300 |
commit | a54bdd76cb34005d07a65c2c3a8198b7b8e8c95a (patch) | |
tree | c30e2477cc3c12b1dd046f4fd12c728114c94563 /source/blender/blenkernel | |
parent | 223f9310955f6b0d6f1089c16802a57e20fcadb3 (diff) |
ClangFormat: format '#if 0' code
Previous cleanups didn't account for space after '#'.
Diffstat (limited to 'source/blender/blenkernel')
-rw-r--r-- | source/blender/blenkernel/intern/mesh_runtime.c | 12 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/smoke.c | 2 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/sound.c | 65 |
3 files changed, 42 insertions, 37 deletions
diff --git a/source/blender/blenkernel/intern/mesh_runtime.c b/source/blender/blenkernel/intern/mesh_runtime.c index dea64e64377..8d482a961b6 100644 --- a/source/blender/blenkernel/intern/mesh_runtime.c +++ b/source/blender/blenkernel/intern/mesh_runtime.c @@ -285,9 +285,15 @@ char *BKE_mesh_runtime_debug_info(Mesh *me_eval) # if 0 const char *tstr; switch (me_eval->type) { - case DM_TYPE_CDDM: tstr = "DM_TYPE_CDDM"; break; - case DM_TYPE_CCGDM: tstr = "DM_TYPE_CCGDM"; break; - default: tstr = "UNKNOWN"; break; + case DM_TYPE_CDDM: + tstr = "DM_TYPE_CDDM"; + break; + case DM_TYPE_CCGDM: + tstr = "DM_TYPE_CCGDM"; + break; + default: + tstr = "UNKNOWN"; + break; } BLI_dynstr_appendf(dynstr, " 'type': '%s',\n", tstr); # endif diff --git a/source/blender/blenkernel/intern/smoke.c b/source/blender/blenkernel/intern/smoke.c index 23cdf802c81..50c72f5a57f 100644 --- a/source/blender/blenkernel/intern/smoke.c +++ b/source/blender/blenkernel/intern/smoke.c @@ -2453,7 +2453,7 @@ static void update_flowsfluids( EmissionMap em_temp = {NULL}; float sample_size = 1.0f / (float)(subframes + 1); # if 0 - float prev_frame_pos = sample_size * (float)(subframe+1); + float prev_frame_pos = sample_size * (float)(subframe + 1); # endif float sdt = dt * sample_size; int hires_multiplier = 1; diff --git a/source/blender/blenkernel/intern/sound.c b/source/blender/blenkernel/intern/sound.c index 383542fa335..b521aa2f954 100644 --- a/source/blender/blenkernel/intern/sound.c +++ b/source/blender/blenkernel/intern/sound.c @@ -391,27 +391,26 @@ void BKE_sound_load(struct Main *bmain, bSound *sound) /* XXX unused currently */ # if 0 - switch (sound->type) - { + 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; @@ -426,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) |