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
2015-07-02Merge branch 'master' into gooseberryAntony Riakiotakis
2015-07-02Text effect strip for sequencer.Antony Riakiotakis
Is pretty much what it says :) Easy subtitles for everyone! Supports size, positioning, a cheap shadow effect (probably will need more work), and autocentering on x axis. Now you can go wild with long spanish names in your soap opera videos. Will probably be refined as days go by, but at least it's now ready for testing.
2015-07-02Merge branch 'master' into gooseberrySergey Sharybin
Conflicts: source/blender/makesdna/DNA_object_types.h
2015-07-01Refactoring:Antony Riakiotakis
Make sure SEQ_TYPE_EFFECT is only used as a flag, not as number comparison. This should allow us to add new non-effect types in between effect types (every 8 indices). Dirty, but alternative of separating type/subtype means we lose forward compatibility.
2015-07-01Merge branch 'master' into gooseberryAntony Riakiotakis
Conflicts: source/blender/blenlib/intern/BLI_filelist.c source/blender/editors/transform/transform.h source/blender/editors/transform/transform_snap.c source/blenderplayer/bad_level_call_stubs/stubs.c
2015-06-30Fix T45251 custom directory not taken into account for image proxies.Antony Riakiotakis
2015-06-27Cleanup: all params of BLI_str partition funcs can be const...Bastien Montagne
2015-06-25Merge branch 'master' into gooseberryAntony Riakiotakis
Conflicts: source/blender/blenkernel/intern/cdderivedmesh.c source/blender/makesrna/intern/rna_nodetree.c
2015-06-25Fix T45190 effect muting does not restore original sequencer display.Antony Riakiotakis
2015-05-19Merge branch 'master' into gooseberryAntony Riakiotakis
2015-05-19Clear animation list to avoid referencing freed memory.Antony Riakiotakis
2015-05-06Merge branch 'master' into gooseberryAntony Riakiotakis
Conflicts: source/blender/editors/object/object_shapekey.c
2015-05-06Image proxies now correctly support metadata (needs to regenerateAntony Riakiotakis
proxies though)
2015-05-04Merge branch 'master' into gooseberryAntony Riakiotakis
Conflicts: source/blender/editors/space_sequencer/sequencer_draw.c
2015-05-04Fix metadata display in sequencer lost after doing a preprocessAntony Riakiotakis
transform. IMB_makeSingleUser makes a copy and destroys metadata. I am not sure if this is the safest way to make a single user ImBuf (setting the refcount to 0 is simpler and there's less, but no zero, risk of dangling pointers) but I will leave this as is for now in case there is an actual need for a copy here. The alternative approach should be tested at some point.
2015-05-04Support displaying metadata for images in sequencer preview windows (notAntony Riakiotakis
backdrop)
2015-05-02Sound now returns even if file fails to loadCampbell Barton
With various codecs its hard to ensure a sound will load or not.
2015-04-22Merge branch 'master' into gooseberryAntony Riakiotakis
Conflicts: source/blender/editors/interface/interface_handlers.c source/blender/editors/space_sequencer/sequencer_draw.c
2015-04-21BLI_string: add BLI_snprintf_rlenCampbell Barton
use when the length of the destination string is needed.
2015-04-20Merge branch 'master' into gooseberrySergey Sharybin
2015-04-20Fix T44458 strip modifier mask not copied correctly when doing sceneAntony Riakiotakis
copy. What happens is that the strip is copied, but it still refers to the old scene. Here we need to fix this by referring to the copy of the strip and also do it after copying to make it order independent.
2015-04-09Merge branch 'master' into gooseberryAntony Riakiotakis
2015-04-09Fix uninitialized var use reading view prefixCampbell Barton
2015-04-09Fix missing NULL checksCampbell Barton
2015-04-09Fix missing NULL checkCampbell Barton
2015-04-08Merge branch 'master' into gooseberryAntony Riakiotakis
2015-04-08Cleanup: confusing if statements & alignmentCampbell Barton
2015-04-07Merge branch 'master' into gooseberryAntony Riakiotakis
Conflicts: source/blender/blenkernel/intern/image.c source/blender/blenkernel/intern/object_dupli.c source/blender/blenkernel/intern/sequencer.c source/blender/blenloader/intern/versioning_270.c source/blender/editors/space_view3d/view3d_draw.c source/blender/editors/space_view3d/view3d_ops.c source/blender/makesdna/DNA_sequence_types.h source/blender/makesdna/DNA_view3d_types.h source/blender/windowmanager/CMakeLists.txt source/blender/windowmanager/intern/wm_operators.c source/blenderplayer/bad_level_call_stubs/stubs.c
2015-04-07Make image strips also follow the project directory storage options.Antony Riakiotakis
2015-04-07CleanupCampbell Barton
2015-04-06Multi-View and Stereo 3DDalai Felinto
Official Documentation: http://www.blender.org/manual/render/workflows/multiview.html Implemented Features ==================== Builtin Stereo Camera * Convergence Mode * Interocular Distance * Convergence Distance * Pivot Mode Viewport * Cameras * Plane * Volume Compositor * View Switch Node * Image Node Multi-View OpenEXR support Sequencer * Image/Movie Strips 'Use Multiview' UV/Image Editor * Option to see Multi-View images in Stereo-3D or its individual images * Save/Open Multi-View (OpenEXR, Stereo3D, individual views) images I/O * Save/Open Multi-View (OpenEXR, Stereo3D, individual views) images Scene Render Views * Ability to have an arbitrary number of views in the scene Missing Bits ============ First rule of Multi-View bug report: If something is not working as it should *when Views is off* this is a severe bug, do mention this in the report. Second rule is, if something works *when Views is off* but doesn't (or crashes) when *Views is on*, this is a important bug. Do mention this in the report. Everything else is likely small todos, and may wait until we are sure none of the above is happening. Apart from that there are those known issues: * Compositor Image Node poorly working for Multi-View OpenEXR (this was working prefectly before the 'Use Multi-View' functionality) * Selecting camera from Multi-View when looking from camera is problematic * Animation Playback (ctrl+F11) doesn't support stereo formats * Wrong filepath when trying to play back animated scene * Viewport Rendering doesn't support Multi-View * Overscan Rendering * Fullscreen display modes need to warn the user * Object copy should be aware of views suffix Acknowledgments =============== * Francesco Siddi for the help with the original feature specs and design * Brecht Van Lommel for the original review of the code and design early on * Blender Foundation for the Development Fund to support the project wrap up Final patch reviewers: * Antony Riakiotakis (psy-fi) * Campbell Barton (ideasman42) * Julian Eisel (Severin) * Sergey Sharybin (nazgul) * Thomas Dinged (dingto) Code contributors of the original branch in github: * Alexey Akishin * Gabriel Caraballo
2015-04-02Merge branch 'master' into gooseberryCampbell Barton
2015-04-02Add custom properties to sequence stripsCampbell Barton
2015-03-27Merge branch 'master' into gooseberryAntony Riakiotakis
2015-03-26Project directory proxies:Antony Riakiotakis
Use BL_proxy if directory is blank to avoid filling the whole folder with files.
2015-03-26Merge branch 'master' into gooseberryAntony Riakiotakis
2015-03-26New option proxy placement, project directory.Antony Riakiotakis
There are two per-editor settings now, the Per-Strip setting (default) and the Project setting. The per strip setting basically uses the previous, per-strip options for storing the proxies. The project setting though will use a specified directory for -all- proxies, or the blend file directory if no directory is given.
2015-03-26Merge branch 'master' into gooseberryLukas Tönne
2015-03-26sound module: Append functions with BKE (makes it easier to make themAntony Riakiotakis
out from local functions)
2015-03-25Merge branch 'master' into gooseberryAntony Riakiotakis
Conflicts: source/blender/gpu/intern/gpu_buffers.c
2015-03-25Allow multiple strips to use the same directory when custom proxyAntony Riakiotakis
directory is used. This is done by appending the name of the file as extra folder. Existing projects may need to regenerate their proxies but it should be possible now to have all proxies nicely in the same custom folder. Next commits will include operators to copy directory settings between selected strips, making the process faster.
2015-03-24Cleanup - move proxy storage options to the proxy itself - also willAntony Riakiotakis
enable more storage options, since seq->flag is running out of space
2015-03-20Merge branch 'master' into gooseberryAntony Riakiotakis
2015-03-20Fix T43986: VSE Mask Modifier don't move with video-Clip.Bastien Montagne
Now mask animation is offset to start of strip, instead of staying at frame 1! Warning: this may break existing files, in case some would be using (hacking around!) current bad behavior...
2015-02-13Painstakingly merge branch 'master' into gooseberryAntony Riakiotakis
Conflicts: release/scripts/startup/bl_ui/space_view3d.py source/blender/blenkernel/BKE_camera.h source/blender/blenkernel/BKE_screen.h source/blender/blenkernel/intern/camera.c source/blender/blenkernel/intern/screen.c source/blender/blenloader/intern/readfile.c source/blender/blenloader/intern/versioning_270.c source/blender/blenloader/intern/writefile.c source/blender/editors/include/ED_view3d.h source/blender/editors/render/render_opengl.c source/blender/editors/space_view3d/space_view3d.c source/blender/editors/space_view3d/view3d_draw.c source/blender/gpu/CMakeLists.txt source/blender/gpu/GPU_compositing.h source/blender/gpu/GPU_extensions.h source/blender/gpu/intern/gpu_compositing.c source/blender/gpu/intern/gpu_extensions.c source/blender/gpu/shaders/gpu_shader_fx_dof_frag.glsl source/blender/gpu/shaders/gpu_shader_fx_dof_vert.glsl source/blender/gpu/shaders/gpu_shader_fx_lib.glsl source/blender/gpu/shaders/gpu_shader_fx_ssao_frag.glsl source/blender/gpu/shaders/gpu_shader_fx_vert.glsl source/blender/makesdna/DNA_camera_types.h source/blender/makesdna/DNA_gpu_types.h source/blender/makesdna/DNA_view3d_types.h source/blender/makesdna/intern/makesdna.c source/blender/makesrna/intern/rna_camera.c source/blender/makesrna/intern/rna_scene.c source/blender/makesrna/intern/rna_space.c
2015-02-11Fix VSE strip channel skip overlapping stripsCampbell Barton
D1096 by @mangostaniko (with some edits)
2015-02-06Bring back yet again no scaling for proxies (squashing to a merge commit is bad)Antony Riakiotakis
2015-02-06Merge branch 'master' into gooseberryAntony Riakiotakis
2015-02-06bring back no scaling for proxiesAntony Riakiotakis
2015-02-06Get rid of no scaling for proxies for master, it causes FX to crash,Antony Riakiotakis
will code another workaround for gooseberry.