diff options
author | Martin Felke <martin.felke@googlemail.com> | 2019-03-02 12:43:27 +0300 |
---|---|---|
committer | Martin Felke <martin.felke@googlemail.com> | 2019-03-02 12:43:27 +0300 |
commit | 7faf3f47363058ba4a2dfb15f180deffe706573e (patch) | |
tree | e0e3f60ecc3e133abcf09983056860cc9d6ad3bf /extern | |
parent | 0c0de344aabd0fb2cfbe998d9b54ca2ac6a70120 (diff) | |
parent | 42faf52d8bcae3b33164069c4c692152cf42b9b3 (diff) |
Merge remote-tracking branch 'origin/master' into fracture_modifier-2.8
# Conflicts:
# intern/cycles/blender/blender_mesh.cpp
# intern/rigidbody/RBI_api.h
# intern/rigidbody/rb_bullet_api.cpp
# source/blender/blenkernel/BKE_rigidbody.h
# source/blender/blenkernel/intern/rigidbody.c
# source/blender/depsgraph/intern/builder/deg_builder_relations.cc
# source/blender/draw/intern/draw_manager.c
# source/blender/editors/physics/rigidbody_object.c
# source/blender/makesdna/DNA_modifier_types.h
# source/blender/makesdna/DNA_rigidbody_types.h
# source/blender/makesrna/intern/rna_modifier.c
# source/blender/makesrna/intern/rna_rigidbody.c
# source/blender/modifiers/intern/MOD_boolean.c
# source/blender/modifiers/intern/MOD_multires.c
# source/blender/modifiers/intern/MOD_remesh.c
Diffstat (limited to 'extern')
24 files changed, 200 insertions, 131 deletions
diff --git a/extern/CMakeLists.txt b/extern/CMakeLists.txt index 5221b0695a0..db8691018a7 100644 --- a/extern/CMakeLists.txt +++ b/extern/CMakeLists.txt @@ -16,11 +16,6 @@ # # The Original Code is Copyright (C) 2006, Blender Foundation # All rights reserved. -# -# The Original Code is: all of this file. -# -# Contributor(s): Jacques Beaurain. -# # ***** END GPL LICENSE BLOCK ***** # Libs that adhere to strict flags diff --git a/extern/audaspace/bindings/C/AUD_Sound.cpp b/extern/audaspace/bindings/C/AUD_Sound.cpp index 30860acde62..1f40f5c608b 100644 --- a/extern/audaspace/bindings/C/AUD_Sound.cpp +++ b/extern/audaspace/bindings/C/AUD_Sound.cpp @@ -212,7 +212,7 @@ AUD_API const char* AUD_Sound_write(AUD_Sound* sound, const char* filename, AUD_ std::shared_ptr<IWriter> writer = FileWriter::createWriter(filename, specs, static_cast<Container>(container), static_cast<Codec>(codec), bitrate); FileWriter::writeReader(reader, writer, 0, buffersize); } - catch(Exception& e) + catch(Exception&) { return "An exception occured while writing."; } diff --git a/extern/audaspace/bindings/python/PySound.cpp b/extern/audaspace/bindings/python/PySound.cpp index 2ab1974be49..82c6036012b 100644 --- a/extern/audaspace/bindings/python/PySound.cpp +++ b/extern/audaspace/bindings/python/PySound.cpp @@ -140,8 +140,6 @@ Sound_data(Sound* self) std::memcpy(data, buffer->getBuffer(), buffer->getSize()); - Py_INCREF(array); - return reinterpret_cast<PyObject*>(array); } diff --git a/extern/audaspace/plugins/ffmpeg/FFMPEGWriter.cpp b/extern/audaspace/plugins/ffmpeg/FFMPEGWriter.cpp index 09b70897c31..2cd3261bd20 100644 --- a/extern/audaspace/plugins/ffmpeg/FFMPEGWriter.cpp +++ b/extern/audaspace/plugins/ffmpeg/FFMPEGWriter.cpp @@ -261,6 +261,8 @@ FFMPEGWriter::FFMPEGWriter(std::string filename, DeviceSpecs specs, Container fo case CHANNELS_SURROUND71: channel_layout = AV_CH_LAYOUT_7POINT1; break; + default: + AUD_THROW(FileException, "File couldn't be written, channel layout not supported."); } try diff --git a/extern/audaspace/plugins/openal/OpenALDevice.cpp b/extern/audaspace/plugins/openal/OpenALDevice.cpp index 2a609789a6d..6ad87c183aa 100644 --- a/extern/audaspace/plugins/openal/OpenALDevice.cpp +++ b/extern/audaspace/plugins/openal/OpenALDevice.cpp @@ -61,10 +61,58 @@ bool OpenALDevice::OpenALHandle::pause(bool keep) return false; } +bool OpenALDevice::OpenALHandle::reinitialize() +{ + DeviceSpecs specs = m_device->m_specs; + specs.specs = m_reader->getSpecs(); + + ALenum format; + + if(!m_device->getFormat(format, specs.specs)) + return true; + + m_format = format; + + // OpenAL playback code + alGenBuffers(CYCLE_BUFFERS, m_buffers); + if(alGetError() != AL_NO_ERROR) + return true; + + m_device->m_buffer.assureSize(m_device->m_buffersize * AUD_DEVICE_SAMPLE_SIZE(specs)); + int length; + bool eos; + + for(m_current = 0; m_current < CYCLE_BUFFERS; m_current++) + { + length = m_device->m_buffersize; + m_reader->read(length, eos, m_device->m_buffer.getBuffer()); + + if(length == 0) + break; + + alBufferData(m_buffers[m_current], m_format, m_device->m_buffer.getBuffer(), length * AUD_DEVICE_SAMPLE_SIZE(specs), specs.rate); + + if(alGetError() != AL_NO_ERROR) + return true; + } + + alGenSources(1, &m_source); + if(alGetError() != AL_NO_ERROR) + return true; + + alSourceQueueBuffers(m_source, m_current, m_buffers); + if(alGetError() != AL_NO_ERROR) + return true; + + alSourcei(m_source, AL_SOURCE_RELATIVE, m_relative); + + return false; +} + OpenALDevice::OpenALHandle::OpenALHandle(OpenALDevice* device, ALenum format, std::shared_ptr<IReader> reader, bool keep) : m_isBuffered(false), m_reader(reader), m_keep(keep), m_format(format), m_eos(false), m_loopcount(0), m_stop(nullptr), m_stop_data(nullptr), m_status(STATUS_PLAYING), - m_device(device) + m_relative(1), m_device(device) { DeviceSpecs specs = m_device->m_specs; specs.specs = m_reader->getSpecs(); @@ -162,6 +210,9 @@ bool OpenALDevice::OpenALHandle::stop() if(!m_status) return false; + if(m_stop) + m_stop(m_stop_data); + m_status = STATUS_INVALID; alDeleteSources(1, &m_source); @@ -525,8 +576,6 @@ bool OpenALDevice::OpenALHandle::setOrientation(const Quaternion& orientation) bool OpenALDevice::OpenALHandle::isRelative() { - int result; - if(!m_status) return false; @@ -535,9 +584,9 @@ bool OpenALDevice::OpenALHandle::isRelative() if(!m_status) return false; - alGetSourcei(m_source, AL_SOURCE_RELATIVE, &result); + alGetSourcei(m_source, AL_SOURCE_RELATIVE, &m_relative); - return result; + return m_relative; } bool OpenALDevice::OpenALHandle::setRelative(bool relative) @@ -550,7 +599,9 @@ bool OpenALDevice::OpenALHandle::setRelative(bool relative) if(!m_status) return false; - alSourcei(m_source, AL_SOURCE_RELATIVE, relative); + m_relative = relative; + + alSourcei(m_source, AL_SOURCE_RELATIVE, m_relative); return true; } @@ -852,6 +903,80 @@ void OpenALDevice::updateStreams() { lock(); + if(m_checkDisconnect) + { + ALCint connected; + alcGetIntegerv(m_device, alcGetEnumValue(m_device, "ALC_CONNECTED"), 1, &connected); + + if(!connected) + { + // quit OpenAL + alcMakeContextCurrent(nullptr); + alcDestroyContext(m_context); + alcCloseDevice(m_device); + + // restart + if(m_name.empty()) + m_device = alcOpenDevice(nullptr); + else + m_device = alcOpenDevice(m_name.c_str()); + + // if device opening failed, there's really nothing we can do + if(m_device) + { + // at least try to set the frequency + + ALCint attribs[] = { ALC_FREQUENCY, (ALCint)specs.rate, 0 }; + ALCint* attributes = attribs; + if(specs.rate == RATE_INVALID) + attributes = nullptr; + + m_context = alcCreateContext(m_device, attributes); + alcMakeContextCurrent(m_context); + + m_checkDisconnect = alcIsExtensionPresent(m_device, "ALC_EXT_disconnect"); + + alcGetIntegerv(m_device, ALC_FREQUENCY, 1, (ALCint*)&specs.rate); + + // check for specific formats and channel counts to be played back + if(alIsExtensionPresent("AL_EXT_FLOAT32") == AL_TRUE) + specs.format = FORMAT_FLOAT32; + else + specs.format = FORMAT_S16; + + // if the format of the device changed, all handles are invalidated + // this is unlikely to happen though + if(specs.format != m_specs.format) + stopAll(); + + m_useMC = alIsExtensionPresent("AL_EXT_MCFORMATS") == AL_TRUE; + + if((!m_useMC && specs.channels > CHANNELS_STEREO) || + specs.channels == CHANNELS_STEREO_LFE || + specs.channels == CHANNELS_SURROUND5) + specs.channels = CHANNELS_STEREO; + + alGetError(); + alcGetError(m_device); + + m_specs = specs; + + std::list<std::shared_ptr<OpenALHandle> > stopSounds; + + for(auto& handle : m_playingSounds) + if(handle->reinitialize()) + stopSounds.push_back(handle); + + for(auto& handle : m_pausedSounds) + if(handle->reinitialize()) + stopSounds.push_back(handle); + + for(auto& sound : stopSounds) + sound->stop(); + } + } + } + alcSuspendContext(m_context); cerr = alcGetError(m_device); if(cerr == ALC_NO_ERROR) @@ -957,12 +1082,14 @@ void OpenALDevice::updateStreams() // if it really stopped if(sound->m_eos && info != AL_INITIAL) { - if(sound->m_stop) - sound->m_stop(sound->m_stop_data); - // pause or if(sound->m_keep) + { + if(sound->m_stop) + sound->m_stop(sound->m_stop_data); + pauseSounds.push_back(sound); + } // stop else stopSounds.push_back(sound); @@ -1005,16 +1132,16 @@ void OpenALDevice::updateStreams() /******************************************************************************/ OpenALDevice::OpenALDevice(DeviceSpecs specs, int buffersize, std::string name) : - m_playing(false), m_buffersize(buffersize) + m_name(name), m_playing(false), m_buffersize(buffersize) { // cannot determine how many channels or which format OpenAL uses, but // it at least is able to play 16 bit stereo audio specs.format = FORMAT_S16; - if(name.empty()) + if(m_name.empty()) m_device = alcOpenDevice(nullptr); else - m_device = alcOpenDevice(name.c_str()); + m_device = alcOpenDevice(m_name.c_str()); if(!m_device) AUD_THROW(DeviceException, "The audio device couldn't be opened with OpenAL."); @@ -1028,6 +1155,8 @@ OpenALDevice::OpenALDevice(DeviceSpecs specs, int buffersize, std::string name) m_context = alcCreateContext(m_device, attributes); alcMakeContextCurrent(m_context); + m_checkDisconnect = alcIsExtensionPresent(m_device, "ALC_EXT_disconnect"); + alcGetIntegerv(m_device, ALC_FREQUENCY, 1, (ALCint*)&specs.rate); // check for specific formats and channel counts to be played back diff --git a/extern/audaspace/plugins/openal/OpenALDevice.h b/extern/audaspace/plugins/openal/OpenALDevice.h index b9b461a327c..c2bec443933 100644 --- a/extern/audaspace/plugins/openal/OpenALDevice.h +++ b/extern/audaspace/plugins/openal/OpenALDevice.h @@ -95,11 +95,16 @@ private: /// Current status of the handle Status m_status; + /// Whether the source is relative or not. + ALint m_relative; + /// Own device. OpenALDevice* m_device; AUD_LOCAL bool pause(bool keep); + AUD_LOCAL bool reinitialize(); + // delete copy constructor and operator= OpenALHandle(const OpenALHandle&) = delete; OpenALHandle& operator=(const OpenALHandle&) = delete; @@ -174,11 +179,21 @@ private: DeviceSpecs m_specs; /** + * The device name. + */ + std::string m_name; + + /** * Whether the device has the AL_EXT_MCFORMATS extension. */ bool m_useMC; /** + * Whether the ALC_EXT_disconnect extension is present and device disconnect should be checked repeatedly. + */ + bool m_checkDisconnect; + + /** * The list of sounds that are currently playing. */ std::list<std::shared_ptr<OpenALHandle> > m_playingSounds; diff --git a/extern/audaspace/src/respec/ChannelMapperReader.cpp b/extern/audaspace/src/respec/ChannelMapperReader.cpp index 850e54b73cf..1af5e70bfc8 100644 --- a/extern/audaspace/src/respec/ChannelMapperReader.cpp +++ b/extern/audaspace/src/respec/ChannelMapperReader.cpp @@ -296,72 +296,77 @@ const Channel* ChannelMapperReader::CHANNEL_MAPS[] = ChannelMapperReader::SURROUND71_MAP }; +constexpr float deg2rad(double angle) +{ + return float(angle * M_PI / 180.0); +} + const float ChannelMapperReader::MONO_ANGLES[] = { - 0.0f * M_PI / 180.0f + deg2rad(0.0) }; const float ChannelMapperReader::STEREO_ANGLES[] = { - -90.0f * M_PI / 180.0f, - 90.0f * M_PI / 180.0f + deg2rad(-90.0), + deg2rad( 90.0) }; const float ChannelMapperReader::STEREO_LFE_ANGLES[] = { - -90.0f * M_PI / 180.0f, - 90.0f * M_PI / 180.0f, - 0.0f * M_PI / 180.0f + deg2rad(-90.0), + deg2rad( 90.0), + deg2rad( 0.0) }; const float ChannelMapperReader::SURROUND4_ANGLES[] = { - -45.0f * M_PI / 180.0f, - 45.0f * M_PI / 180.0f, - -135.0f * M_PI / 180.0f, - 135.0f * M_PI / 180.0f + deg2rad( -45.0), + deg2rad( 45.0), + deg2rad(-135.0), + deg2rad( 135.0) }; const float ChannelMapperReader::SURROUND5_ANGLES[] = { - -30.0f * M_PI / 180.0f, - 30.0f * M_PI / 180.0f, - 0.0f * M_PI / 180.0f, - -110.0f * M_PI / 180.0f, - 110.0f * M_PI / 180.0f + deg2rad( -30.0), + deg2rad( 30.0), + deg2rad( 0.0), + deg2rad(-110.0), + deg2rad( 110.0) }; const float ChannelMapperReader::SURROUND51_ANGLES[] = { - -30.0f * M_PI / 180.0f, - 30.0f * M_PI / 180.0f, - 0.0f * M_PI / 180.0f, - 0.0f * M_PI / 180.0f, - -110.0f * M_PI / 180.0f, - 110.0f * M_PI / 180.0f + deg2rad( -30.0), + deg2rad( 30.0), + deg2rad( 0.0), + deg2rad( 0.0), + deg2rad(-110.0), + deg2rad( 110.0) }; const float ChannelMapperReader::SURROUND61_ANGLES[] = { - -30.0f * M_PI / 180.0f, - 30.0f * M_PI / 180.0f, - 0.0f * M_PI / 180.0f, - 0.0f * M_PI / 180.0f, - 180.0f * M_PI / 180.0f, - -110.0f * M_PI / 180.0f, - 110.0f * M_PI / 180.0f + deg2rad( -30.0), + deg2rad( 30.0), + deg2rad( 0.0), + deg2rad( 0.0), + deg2rad( 180.0), + deg2rad(-110.0), + deg2rad( 110.0) }; const float ChannelMapperReader::SURROUND71_ANGLES[] = { - -30.0f * M_PI / 180.0f, - 30.0f * M_PI / 180.0f, - 0.0f * M_PI / 180.0f, - 0.0f * M_PI / 180.0f, - -110.0f * M_PI / 180.0f, - 110.0f * M_PI / 180.0f, - -150.0f * M_PI / 180.0f, - 150.0f * M_PI / 180.0f + deg2rad( -30.0), + deg2rad( 30.0), + deg2rad( 0.0), + deg2rad( 0.0), + deg2rad(-110.0), + deg2rad( 110.0), + deg2rad(-150.0), + deg2rad( 150.0) }; const float* ChannelMapperReader::CHANNEL_ANGLES[] = diff --git a/extern/bullet2/CMakeLists.txt b/extern/bullet2/CMakeLists.txt index 949a8b01bd2..7a19b553fdb 100644 --- a/extern/bullet2/CMakeLists.txt +++ b/extern/bullet2/CMakeLists.txt @@ -16,11 +16,6 @@ # # The Original Code is Copyright (C) 2006, Blender Foundation # All rights reserved. -# -# The Original Code is: all of this file. -# -# Contributor(s): Jacques Beaurai, Erwin Coumans -# # ***** END GPL LICENSE BLOCK ***** set(INC diff --git a/extern/ceres/CMakeLists.txt b/extern/ceres/CMakeLists.txt index 82695133a15..3a9ade5510a 100644 --- a/extern/ceres/CMakeLists.txt +++ b/extern/ceres/CMakeLists.txt @@ -16,10 +16,6 @@ # # The Original Code is Copyright (C) 2012, Blender Foundation # All rights reserved. -# -# Contributor(s): Blender Foundation, -# Sergey Sharybin -# # ***** END GPL LICENSE BLOCK ***** # NOTE: This file is automatically generated by bundle.sh script diff --git a/extern/clew/CMakeLists.txt b/extern/clew/CMakeLists.txt index f75e933034f..940db3d7194 100644 --- a/extern/clew/CMakeLists.txt +++ b/extern/clew/CMakeLists.txt @@ -16,11 +16,6 @@ # # The Original Code is Copyright (C) 2006, Blender Foundation # All rights reserved. -# -# The Original Code is: all of this file. -# -# Contributor(s): Jacques Beaurain. -# # ***** END GPL LICENSE BLOCK ***** set(INC diff --git a/extern/cuew/CMakeLists.txt b/extern/cuew/CMakeLists.txt index 9ba390b3225..1fc5c8f6978 100644 --- a/extern/cuew/CMakeLists.txt +++ b/extern/cuew/CMakeLists.txt @@ -16,11 +16,6 @@ # # The Original Code is Copyright (C) 2006, Blender Foundation # All rights reserved. -# -# The Original Code is: all of this file. -# -# Contributor(s): Jacques Beaurain. -# # ***** END GPL LICENSE BLOCK ***** set(INC diff --git a/extern/curve_fit_nd/intern/curve_fit_cubic_refit.c b/extern/curve_fit_nd/intern/curve_fit_cubic_refit.c index 83b2383f58c..eda8ff27f8c 100644 --- a/extern/curve_fit_nd/intern/curve_fit_cubic_refit.c +++ b/extern/curve_fit_nd/intern/curve_fit_cubic_refit.c @@ -1490,4 +1490,3 @@ int curve_fit_cubic_to_points_refit_fl( return result; } - diff --git a/extern/gflags/CMakeLists.txt b/extern/gflags/CMakeLists.txt index a473e6ffb40..da24e5504a3 100644 --- a/extern/gflags/CMakeLists.txt +++ b/extern/gflags/CMakeLists.txt @@ -16,10 +16,6 @@ # # The Original Code is Copyright (C) 2016, Blender Foundation # All rights reserved. -# -# Contributor(s): Blender Foundation, -# Sergey Sharybin -# # ***** END GPL LICENSE BLOCK ***** set(INC diff --git a/extern/glew-es/CMakeLists.txt b/extern/glew-es/CMakeLists.txt index ea25425df81..8f14855bf4f 100644 --- a/extern/glew-es/CMakeLists.txt +++ b/extern/glew-es/CMakeLists.txt @@ -16,11 +16,6 @@ # # The Original Code is Copyright (C) 2013, Blender Foundation # All rights reserved. -# -# The Original Code is: all of this file. -# -# Contributor(s): Jason Wilkins -# # ***** END GPL LICENSE BLOCK ***** set(INC diff --git a/extern/glew/CMakeLists.txt b/extern/glew/CMakeLists.txt index c9323fa12b2..47d38586d1a 100644 --- a/extern/glew/CMakeLists.txt +++ b/extern/glew/CMakeLists.txt @@ -16,11 +16,6 @@ # # The Original Code is Copyright (C) 2006, Blender Foundation # All rights reserved. -# -# The Original Code is: all of this file. -# -# Contributor(s): Jacques Beaurain. -# # ***** END GPL LICENSE BLOCK ***** set(INC diff --git a/extern/glog/CMakeLists.txt b/extern/glog/CMakeLists.txt index df64718ee95..82b415d06d7 100644 --- a/extern/glog/CMakeLists.txt +++ b/extern/glog/CMakeLists.txt @@ -16,10 +16,6 @@ # # The Original Code is Copyright (C) 2016, Blender Foundation # All rights reserved. -# -# Contributor(s): Blender Foundation, -# Sergey Sharybin -# # ***** END GPL LICENSE BLOCK ***** set(INC diff --git a/extern/gmock/CMakeLists.txt b/extern/gmock/CMakeLists.txt index c0c87009328..73e524d80cd 100644 --- a/extern/gmock/CMakeLists.txt +++ b/extern/gmock/CMakeLists.txt @@ -16,9 +16,6 @@ # # The Original Code is Copyright (C) 2014, Blender Foundation # All rights reserved. -# -# Contributor(s): Sergey Sharybin -# # ***** END GPL LICENSE BLOCK ***** set(INC diff --git a/extern/gtest/CMakeLists.txt b/extern/gtest/CMakeLists.txt index 21b296f93df..22b47e76b12 100644 --- a/extern/gtest/CMakeLists.txt +++ b/extern/gtest/CMakeLists.txt @@ -16,9 +16,6 @@ # # The Original Code is Copyright (C) 2014, Blender Foundation # All rights reserved. -# -# Contributor(s): Sergey Sharybin -# # ***** END GPL LICENSE BLOCK ***** # avoid noisy warnings diff --git a/extern/lzma/CMakeLists.txt b/extern/lzma/CMakeLists.txt index 31670f595f6..d4fe8ade9ba 100644 --- a/extern/lzma/CMakeLists.txt +++ b/extern/lzma/CMakeLists.txt @@ -16,11 +16,6 @@ # # The Original Code is Copyright (C) 2006, Blender Foundation # All rights reserved. -# -# The Original Code is: all of this file. -# -# Contributor(s): Daniel Genrich -# # ***** END GPL LICENSE BLOCK ***** set(INC diff --git a/extern/lzo/CMakeLists.txt b/extern/lzo/CMakeLists.txt index 23bbf268cc6..e4609963d29 100644 --- a/extern/lzo/CMakeLists.txt +++ b/extern/lzo/CMakeLists.txt @@ -16,11 +16,6 @@ # # The Original Code is Copyright (C) 2006, Blender Foundation # All rights reserved. -# -# The Original Code is: all of this file. -# -# Contributor(s): Daniel Genrich -# # ***** END GPL LICENSE BLOCK ***** remove_strict_flags() diff --git a/extern/sdlew/CMakeLists.txt b/extern/sdlew/CMakeLists.txt index 8571ad9251d..c0cd9944755 100644 --- a/extern/sdlew/CMakeLists.txt +++ b/extern/sdlew/CMakeLists.txt @@ -16,11 +16,6 @@ # # The Original Code is Copyright (C) 2006, Blender Foundation # All rights reserved. -# -# The Original Code is: all of this file. -# -# Contributor(s): Jacques Beaurain. -# # ***** END GPL LICENSE BLOCK ***** set(INC diff --git a/extern/wcwidth/CMakeLists.txt b/extern/wcwidth/CMakeLists.txt index 724c5ea5d74..29a2977c3eb 100644 --- a/extern/wcwidth/CMakeLists.txt +++ b/extern/wcwidth/CMakeLists.txt @@ -16,11 +16,6 @@ # # The Original Code is Copyright (C) 2013, Blender Foundation # All rights reserved. -# -# The Original Code is: all of this file. -# -# Contributor(s): none yet. -# # ***** END GPL LICENSE BLOCK ***** set(INC diff --git a/extern/wcwidth/wcwidth.h b/extern/wcwidth/wcwidth.h index e327921b6ea..9ae6ec9ef14 100644 --- a/extern/wcwidth/wcwidth.h +++ b/extern/wcwidth/wcwidth.h @@ -1,6 +1,4 @@ /* - * ***** BEGIN GPL LICENSE BLOCK ***** - * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 @@ -17,10 +15,6 @@ * * The Original Code is Copyright (C) 2013 Blender Foundation. * All rights reserved. - * - * Contributor(s): none yet. - * - * ***** END GPL LICENSE BLOCK ***** */ #ifndef __WCWIDTH_H__ diff --git a/extern/xdnd/CMakeLists.txt b/extern/xdnd/CMakeLists.txt index 832ddfde396..9a24606d133 100644 --- a/extern/xdnd/CMakeLists.txt +++ b/extern/xdnd/CMakeLists.txt @@ -16,11 +16,6 @@ # # The Original Code is Copyright (C) 2012, Blender Foundation # All rights reserved. -# -# The Original Code is: all of this file. -# -# Contributor(s): Sergey Sharybin. -# # ***** END GPL LICENSE BLOCK ***** set(INC |