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
AgeCommit message (Collapse)Author
2018-09-12Merge branch 'master' into blender2.8Campbell Barton
2018-09-11Build: require OpenJPEG 2.x minimum, remove bundled version.Brecht Van Lommel
* WITH_SYSTEM_OPENJPEG is removed and is now always on, this was already the case for macOS and Windows. * This should not break existing Linx builds. If there is no new enough OpenJPEG installed, CMake will no find libopenjp2 and WITH_IMAGE_OPENJPEG will be disabled. * install_deps.sh was updated with new package names, since distributions put this version in a new package. Differential Revision: https://developer.blender.org/D3663
2018-09-05Merge branch 'master' into blender2.8Campbell Barton
2018-09-05Fix T54152: --env-system-scripts fails on win32Ray Molenkamp
2018-09-03Merge branch 'master' into blender2.8Bastien Montagne
Conflicts: source/blender/blenkernel/intern/collision.c
2018-09-03Spelling fixes in comments and descriptions, patch by luzpaz.Brecht Van Lommel
Differential Revision: https://developer.blender.org/D3668
2018-09-02Cleanup: comment blocksCampbell Barton
2018-09-02Cleanup: comment blocksCampbell Barton
2018-08-26Cleanup: styleCampbell Barton
2018-08-10Cleanup: styleCampbell Barton
2018-08-08Merge branch 'master' into blender2.8Brecht Van Lommel
2018-08-08OpenJPEG: support building against both 1.5 and 2.3.Brecht Van Lommel
Patch porting to OpenJPEG 2.3 is by Campbell. Once all platforms are upgraded we can remove the code for 1.5, and upgrade or remove the openjpeg version from extern/. This intermediate step makes it possible for platform maintainers to upgrade to 2.3 without breaking other platforms.
2018-07-17Merge branch 'master' into blender2.8Bastien Montagne
2018-07-17Fix T56003: Opening image files as movies in VSE crashes.Bastien Montagne
metadata loading code was assuming all videos in Blender were from FFMPEG... added empty place-holders for other types too, we probably could load some metadata from pictures or AVI files too!
2018-07-10Cleanup: remove unused interlace code after removal of fields.Brecht Van Lommel
2018-06-29Merge branch 'master' into blender2.8Campbell Barton
2018-06-29Cleanup: trailing newlinesCampbell Barton
2018-06-26Merge branch 'master' into blender2.8Sybren A. Stüvel
2018-06-26Revert "Turned off clang warnings in third party includes."Stefan Werner
This reverts commit d53093953f8f3b58600cb19020ecbe0b5f254b52.
2018-06-26Merge branch 'master' into blender2.8Campbell Barton
2018-06-26Turned off clang warnings in third party includes.Stefan Werner
The latest clang compiler (at least the one in Xcode 9.4.1) warns about the register keyword and macro expansions using defined(). Since these warnings come from third party code, we can't address them directly in Blender. Silencing them via #pramgas will at least keep the warnings during a build down to the ones that are relevant to Blender code.
2018-06-22Merge branch 'master' into blender2.8Sergey Sharybin
2018-06-22CMake: Make language explicit for per-file strict flags removalSergey Sharybin
2018-06-17Merge branch 'master' into blender2.8Campbell Barton
2018-06-17Cleanup: trailing space for imbuf moduleCampbell Barton
2018-06-17Merge branch 'master' into blender2.8Campbell Barton
2018-06-17Cleanup: BLI path extension APICampbell Barton
Use BLI_path_extension_* prefix.
2018-06-01Merge branch 'master' into blender2.8Campbell Barton
2018-06-01Cleanup: trailing whitespace (comment blocks)Campbell Barton
Strip unindented comment blocks - mainly headers to avoid conflicts.
2018-05-07Merge branch 'master' into blender2.8Campbell Barton
2018-05-07Merge branch 'master' into blender2.8Campbell Barton
2018-05-07Cleanup: rename char/float conversion functionsCampbell Barton
- FTOCHAR -> unit_float_to_uchar_clamp - F3TOCHAR3 -> unit_float_to_uchar_clamp_v3 (swap args) - F4TOCHAR4 -> unit_float_to_uchar_clamp_v4 (swap args) - FTOUSHORT -> unit_float_to_ushort_clamp - USHORTTOUCHAR -> unit_ushort_to_uchar
2018-05-07Cleanup: move unit char/short/float to functionsCampbell Barton
This caused GCC 8.1 to crash at build time, but was also not very nice use of macros.
2018-04-17Removing Blender Game Engine from Blender 2.8Dalai Felinto
Folders removed entirely: * //extern/recastnavigation * //intern/decklink * //intern/moto * //source/blender/editors/space_logic * //source/blenderplayer * //source/gameengine This includes DNA data and any reference to the BGE code in Blender itself. We are bumping the subversion. Pending tasks: * Tile/clamp code in image editor draw code. * Viewport drawing code (so much of this will go away because of BI removal that we can wait until then to remove this.
2018-04-16Merge branch 'master' into blender2.8Campbell Barton
2018-04-16Cleanup: indentationCampbell Barton
2018-04-16Cleanup: indentationCampbell Barton
2018-04-08Merge branch 'master' into blender2.8Sybren A. Stüvel
2018-04-06Cleanup: style, doxy headersCampbell Barton
2018-04-05Merge branch 'master' into blender2.8Sybren A. Stüvel
2018-04-05Load metadata from video files and expose via RNASybren A. Stüvel
The MovieSequence and MovieClip classes now have a metadata() function that exposes the `IDProperty *` holding the video metadata. Part of: https://developer.blender.org/D2273 Reviewed by: @campbellbarton
2018-04-05IMB_metadata improvementsSybren A. Stüvel
- Metadata handling is now separate from `ImBuf *`, allowing it to be used with a generic `IDProperty *`. - Merged `IMB_metadata_add_field()` and `IMB_metadata_change_field()` into a more robust `IMB_metadata_set_field()`. This new function doesn't return any status (it now always succeeds, and the previously existing return value was never checked anyway). - Removed `IMB_metadata_del_field()` as it was never actually used anywhere. - Use `IMB_metadata_ensure()` instead of having `IMB_metadata_set_field()` create the containing `IDProperty` for you. - Deduplicated function declarations, moved `intern/IMB_metadata.h` out of `intern/`. Note that this does mean that we have some extra `#include "IMB_metadata.h"` lines now, as the metadata functions are no longer declared in `IMB_imbuf.h`. - Deduplicated function declarations, all metadata-related declarations are now in imbuf/IMB_metadata.h. Part of: https://developer.blender.org/D2273 Reviewed by: @campbellbarton
2018-04-03Merge branch 'master' into blender2.8Campbell Barton
2018-04-02Cleanup: remove redundant imbuf return valuesCampbell Barton
Some functions always returned the input argument which was never used. This made code read as if there might be a leak. Now return a boolean (true the imbuf is modified).
2018-04-02Merge branch 'master' into blender2.8Campbell Barton
2018-04-02Cleanup: move BKE_global include under ifdef'sCampbell Barton
2018-04-02imbuf: revert some of the changes of ↵Ray Molenkamp
rBb6ba3c682dd6615e760905572a5bcd69bb46371f since they broke the build.
2018-04-01Merge branch 'master' into blender2.8Campbell Barton
- Undo that changes modes currently asserts, since undo is now screen data. Most likely we will change how object mode and workspaces work since it's not practical/maintainable at the moment. - Removed view_layer from particle settings (wasn't needed and complicated undo).
2018-04-01Cleanup: remove global headerCampbell Barton
2018-03-10Merge branch 'master' into blender2.8Brecht Van Lommel