January 24, 2015, 05:52 (GMT) |
Merge branch 'master' into multiview Conflicts: source/blender/render/intern/source/render_result.c |
January 24, 2015, 05:50 (GMT) |
Cleanup: style |
January 21, 2015, 18:29 (GMT) |
Sequencer Proxy: Image - Avoid creating unecessary proxy image files |
January 21, 2015, 18:29 (GMT) |
Sequencer Proxy: Images - add the view suffix only when view_id > 0 This way proxies created for monoscopic image strips created in previous Blenders work out of the box |
January 21, 2015, 18:29 (GMT) |
Small refactor using BKE_scene_view_id_suffix_get() |
January 21, 2015, 18:29 (GMT) |
Sequencer Proxy: movies sequences in a working state, aka everything working Proxies in the Sequencer are fully working with Multiview. The code can be cleaned up a bit, but at least it's entirely functional. Note, for images we generate one proxy image per view (per frame), while for movies we generate one proxy movie per movie (so an anaglyph movie will generate only one proxy). Tested cases: * Image sequence - mono * Image sequence - 3d top-bottom encoded * Image sequence - 3d left-right pair * Movie sequence - mono * Movie sequence - 3d top-bottom encoded * Movie sequence - 3d left-right pair |
January 21, 2015, 18:28 (GMT) |
Merge remote-tracking branch 'origin/master' into multiview Conflicts: intern/cycles/blender/addon/ui.py source/blender/makesrna/intern/rna_space.c |
January 16, 2015, 21:56 (GMT) |
Fix some building issues (hopefully) |
January 16, 2015, 21:28 (GMT) |
Movie Writing: changes to encapsulate the elements (as oppose to have everything static) You can now export individual streams of videos (e.g., Movie_L.mov, Movie_R.mov) safely! =) Before that not only were the names clashing (as I initially thought) but in fact the whole video streaming was mixed up (when you had to export more than one video simultaneously). The way to solve this is to *stop* using static elements and to create a context to store the current movie data. This commits involves a lot of changes, but I believe things are working well. In fact the way I was handling MovieHandler was wrong (creating arrays and all that), so I'm really glad I got to this. Note: I couldn't test Frameserver, in fact test with the general codecs (using multiview or not) are appreciated. Thanks for Sergey Sharybin for the suggestions that lead to this solution. |
January 16, 2015, 21:15 (GMT) |
Merge remote-tracking branch 'origin/master' into multiview |
January 16, 2015, 03:38 (GMT) |
From review: name arrays with _arr suffix |
January 16, 2015, 03:29 (GMT) |
Partial Fix for Movie Exporting name clash Before if we exported (from anywhere) videos in the Individual Views format the _L and _R videos would have the same name. Not anymore. This was required before I finish the support for Movie proxies in the sequencer. Or maybe not required, but at least related, and I wanted to get this over with before finish up the proxies anyways. Big Important Note: =================== This is still not working for video formats that rely on the writeffmpeg.c file. (not that I tested the other formats, but I know it's breaking with MPEG + Quickime + H.264. The code in that file uses a lot of statics, and they make it impossible to writei two movies simultaneously. That may be why we don't have an option to export videos from the 'File Output' compositor node. I thought about two ways of going around that: 1) do something similar with how we handle Render structs, so instead of having one static of each property we store a whole struct in a listbase and populate it with the needed elements. 2) we quit using static elements and pass a custom struct to the mh.* functions (start_movie, append_movie, ...). And we store this struct in the mf struct. |
January 15, 2015, 16:28 (GMT) |
Merge remote-tracking branch 'origin/master' into multiview |
January 14, 2015, 14:06 (GMT) |
Sequencer Proxy: image sequence in a working state Tested: mono, top-bottom and individual views (_L, _R) image sequences We are creating a proxy file for each individual view, even when the image is 3D encoded (e.g., a top-bottom image will generate 2 proxy files). On-going Development Notes: 1) 3D Movies relying on individual files (_R, _L) are not generating the proxies correctly at the moment (probably due to name clashing and the fact that movie names are handled depth inside the code - which is a known cause for another issue to be fixed when the user tries to export a movie animation in the Invidual Views mode). 2) At the moment we are looping over all possible available views, instead of getting from the current Sequencer. We should probably change that. |
January 9, 2015, 20:36 (GMT) |
Fix for left/right sequencer image strip not loading (since recent cleanup for review) |
January 9, 2015, 18:46 (GMT) |
From review: add a suffix to arrays names |
January 6, 2015, 13:06 (GMT) |
Merge remote-tracking branch 'origin/master' into multiview Conflicts: release/scripts/startup/bl_ui/space_sequencer.py source/blender/blenkernel/BKE_sequencer.h source/blender/blenkernel/intern/camera.c source/blender/blenkernel/intern/sequencer.c source/blender/blenloader/intern/versioning_270.c source/blender/editors/include/ED_view3d.h source/blender/editors/render/render_opengl.c source/blender/editors/render/render_preview.c source/blender/editors/space_sequencer/sequencer_add.c source/blender/editors/space_sequencer/sequencer_draw.c source/blender/editors/space_view3d/view3d_draw.c source/blender/makesrna/intern/rna_color.c source/blender/makesrna/intern/rna_image.c source/blender/render/extern/include/RE_pipeline.h source/blender/render/intern/source/external_engine.c source/blender/render/intern/source/pipeline.c source/blender/windowmanager/intern/wm_files.c |
December 2, 2014, 22:40 (GMT) |
Sequencer: fix for random crashes (after duplicating or cutting strips) |
November 26, 2014, 18:57 (GMT) |
Merge remote-tracking branch 'origin/master' into multiview Conflicts: source/blender/editors/space_view3d/view3d_draw.c |
November 26, 2014, 18:35 (GMT) |
From review: leftover from d9d94d0c (remove viewname from RE_display_update_cb) |
|