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-06-17Merge branch 'master' into blender2.8Campbell Barton
2018-06-17Cleanup: BLI path extension APICampbell Barton
Use BLI_path_extension_* prefix.
2018-06-05Merge branch 'master' into blender2.8Bastien Montagne
Conflicts: source/blender/blenkernel/intern/blendfile.c source/blender/blenloader/intern/readfile.h source/blender/blenloader/intern/versioning_250.c source/blender/blenloader/intern/versioning_260.c source/blender/blenloader/intern/versioning_270.c source/blender/blenloader/intern/versioning_legacy.c source/blender/editors/render/render_shading.c source/blender/makesrna/intern/rna_movieclip.c source/blender/render/intern/source/pipeline.c source/blender/render/intern/source/voxeldata.c
2018-06-05Cleanup: use new accessors to blendfile path (Main.name).Bastien Montagne
2018-06-04Merge branch 'master' into blender2.8Campbell Barton
2018-06-04Cleanup: strip trailing space in editorsCampbell Barton
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-06-01Merge branch 'master' into blender2.8Bastien Montagne
Conflicts: source/blender/editors/io/io_collada.c source/blender/editors/object/object_bake.c source/blender/editors/object/object_edit.c source/blender/editors/render/render_internal.c source/blender/makesrna/intern/rna_object_api.c source/blenderplayer/bad_level_call_stubs/stubs.c
2018-06-01Cleanup: some more G.main removal from editor code.Bastien Montagne
2018-05-31Sequencer: Make dependency graph part of sequencer contextSergey Sharybin
Currently unused, but will be needed soon to deal with active edit window context.
2018-04-16Depsgraph: remove EvaluationContext, pass Depsgraph instead.Brecht Van Lommel
The depsgraph was always created within a fixed evaluation context. Passing both risks the depsgraph and evaluation context not matching, and it complicates the Python API where we'd have to expose both which is not so easy to understand. This also removes the global evaluation context in main, which assumed there to be a single active scene and view layer. Differential Revision: https://developer.blender.org/D3152
2018-03-05Merge branch 'master' into blender2.8Sergey Sharybin
2018-03-05Cleanup: left wrong comment inCampbell Barton
2018-03-05Fix T53478, T53430: Sequencer cut edge case failsCampbell Barton
Previous fix for T53430 caused T54200. The edge case for soft & hard cuts weren't working, where the strip used start/end-still & the frame was placed exactly on the start/end of of the sequence content. T54200 fixed the end-still case but broke hard-cuts for all other cases. This fixes the case for soft/hard cuts with/without start/end-still.
2018-03-05Revert "Fix T53430: Cut at the strip end fails w/ endstill"Campbell Barton
This reverts commit 855799ecc1c5e53d9fbfe520fd5402bc0138f674. Caused T54200
2018-02-09Merge branch 'master' into blender2.8Campbell Barton
2018-02-09Fix T53958: Sequencer zoom 1:1 failsCampbell Barton
2017-12-19Merge branch 'master' into blender2.8Sergey Sharybin
2017-12-19Cleanup: Don't use camel case for variable namesSergey Sharybin
2017-12-05Merge branch 'master' into blender2.8Antonio Vazquez
2017-12-05Fix T53430: Cut at the strip end fails w/ endstillCampbell Barton
2017-11-29Merge branch 'master' into blender2.8Brecht Van Lommel
2017-11-29Sequencer: add many more color blend modes, and a new color mix strip.Maikon Araujo
Differential Revision: https://developer.blender.org/D2872
2017-10-18Merge branch 'master' into blender2.8Campbell Barton
2017-10-18Cleanup: Use const for RNA EnumPropertyItem argsCampbell Barton
Practically all access to enum data is read-only.
2017-10-16Merge branch 'master' into blender2.8Campbell Barton
2017-10-16WM: refactor gestures for use as toolsCampbell Barton
Border and circle select wait for input by default. This commit uses bool properties on the operators instead of magic number (called "gesture_mode"). Keymaps that define 'deselect' for border/circle select begin immediately, exiting when on button release.
2017-10-16Cleanup: modal operator border callback namesCampbell Barton
Use same convention as all others. Remove 'select' since these are used for zoom as well.
2017-10-11Merge branch 'master' into blender2.8Sergey Sharybin
2017-10-09UI: VSE strip menu reorganizationAaron Carlisle
Add Inputs and Transform submenus.
2017-08-10Merge branch 'master' into blender2.8Bastien Montagne
2017-08-10Fix T52332: crash when duplicating sequencer strips.Bastien Montagne
Bug introduced in recent ID copying refactor. This commit basically sanitizes seq strip copying behavior, by making destination scene pointer mandatory (and source one a const one). Nothing then prevents you from using same pointer as source and destination!
2017-08-07Refactor ID copying (and to some extent, ID freeing).Bastien Montagne
This will allow much finer controll over how we copy data-blocks, from full copy in Main database, to "lighter" ones (out of Main, inside an already allocated datablock, etc.). This commit also transfers a llot of what was previously handled by per-ID-type custom code to generic ID handling code in BKE_library. Hopefully will avoid in future inconsistencies and missing bits we had all over the codebase in the past. It also adds missing copying handling for a few types, most notably Scene (which where using a fully customized handling previously). Note that the type of allocation used during copying (regular in Main, allocated but outside of Main, or not allocated by ID handling code at all) is stored in ID's, which allows to handle them correctly when freeing. This needs to be taken care of with caution when doing 'weird' unusual things with ID copying and/or allocation! As a final note, while rather noisy, this commit will hopefully not break too much existing branches, old 'API' has been kept for the main part, as a wrapper around new code. Cleaning it up will happen later. Design task : T51804 Phab Diff: D2714
2017-08-07Refactor ID copying (and to some extent, ID freeing).Bastien Montagne
This will allow much finer controll over how we copy data-blocks, from full copy in Main database, to "lighter" ones (out of Main, inside an already allocated datablock, etc.). This commit also transfers a llot of what was previously handled by per-ID-type custom code to generic ID handling code in BKE_library. Hopefully will avoid in future inconsistencies and missing bits we had all over the codebase in the past. It also adds missing copying handling for a few types, most notably Scene (which where using a fully customized handling previously). Note that the type of allocation used during copying (regular in Main, allocated but outside of Main, or not allocated by ID handling code at all) is stored in ID's, which allows to handle them correctly when freeing. This needs to be taken care of with caution when doing 'weird' unusual things with ID copying and/or allocation! As a final note, while rather noisy, this commit will hopefully not break too much existing branches, old 'API' has been kept for the main part, as a wrapper around new code. Cleaning it up will happen later. Design task : T51804 Phab Diff: D2714
2017-07-13Merge branch 'master' into blender2.8Sybren A. Stüvel
2017-07-13Sequence editor: Renamed "Override" to "Overwrite" in "Set Selected Strip ↵Sybren A. Stüvel
Proxies" The option has always (un)set the "Overwrite" flag on all strips. Calling it "Override" seems misleading, since even when unchecking it, it overrides whatever was set on the selected strips. It really just (un)sets the "Overwrite" flag, and now it is also labeled as such.
2017-05-31Merge branch 'master' into blender2.8Sergey Sharybin
2017-05-31Fix T51661: Swaping strips does not refresh sequencerSergey Sharybin
2017-05-20Merge branch 'master' into blender2.8Campbell Barton
2017-05-20CMake: Use GCC7's -Wimplicit-fallthrough=5Campbell Barton
Use to avoid accidental missing break statements, use ATTR_FALLTHROUGH to suppress.
2017-02-15Remove redundant draw call (sequencer)Luca Rood
`SEQUENCER_OT_slip` was calling `draw_sequence_extensions` to redraw the extensions during modal operation, but that is redundant, as it is already called by the regular draw loop. Because it was called on top of the draw loop, it was actually obscuring other parts of the strip that would normally be drawn on top of it. Somewhat part of 49043
2016-05-14Fix T48426: Use same length for all header message strings.Bastien Montagne
Some languages like Chinese or Japanese take three or four bytes per char... Also fixed some missing translation markers for UI header messages.
2016-04-17"View Frame" now works in the sequencer tooJoshua Leung
2016-03-21Fix T47862: VSE hard cut failsCampbell Barton
Regression caused by changing how video length is calculated, however similar problems could be caused by strip length changing on-disk.
2016-02-11Fix T47378: Separate images popup UI does nothingCampbell Barton
Use confirm popup instead of redo popup
2016-02-07Cleanup: line widthCampbell Barton
2016-01-29Cleanup: remove unused codeCampbell Barton
2016-01-27Sequencer: Fix crash when trying to change filepath of Sound stripSergey Sharybin
It was not implemented and fallback RNA-based approach was not correct since there's no filepath property of sound strip.
2015-12-15Fix 'change path' opening file browser with wrong filter for sound stripsJulian Eisel
Changing path of a sound strip (select strip->C->'Path/Files') opened a file browser without filter for sound files, so sound files weren't visible. Also, for movie/image files, now only movie **or** image files are visible in the file browser by default (instead of both). Reported by @venomgfx, thanks!