Blender Git Loki

after merge fix

Merge remote-tracking branch 'origin/master' into multiview

Sequencer render of scene strips working fine

Basically the issue was that rr was being freed and re-allocated inside
the BKE_sequencer_give_ibuf() function - more specifically after
RE_InitState() calls render_result_free().

Thanks to Jens Verwiebe for the help in cross-debug this.

Sequencer, scene render (work in progress)

Rendering crashes after a few attempts (or a few frames when rendering a
sequencer). It seems memory related.

The overall problem is that the re->result is not consistent across the
entire render session it seems. Still investigating.

quiet warning

more ifdef WITH_OPENEXR

Sequencer: OpenGL preview and OpenGL render working correctly

Merge remote-tracking branch 'origin/master' into multiview

Note: this also includes some house-keeping in the image_buttons.c to
handle the recent changes in the file.

Conflicts:
release/datafiles/locale
source/blender/blenloader/intern/versioning_270.c
source/blender/editors/space_image/image_buttons.c

Sequencer Multi-View/Stereo 3D initial commit

What works:
* Scene strips.
* Any non-image strips.

What doesn't work well:
* OpenGL Render (and preview) from sequencer is buggy (it doesn't use
the correct camera shift). It's particularly bad for Stereo 3D.
* Right now there is no way of previewing only a view (e.g., left)
in a way it's the same we do with the Compositor backdrop.

What doesn't work yet:
* Any image or movie strip (they work as mono at the moment).

Merge remote-tracking branch 'origin/master' into multiview

Conflicts:
source/blender/blenkernel/intern/image.c
source/blender/blenloader/intern/versioning_270.c
source/blender/editors/sculpt_paint/paint_image_proj.c
source/blender/editors/space_image/image_buttons.c
source/blender/editors/space_image/image_ops.c
source/blender/editors/space_view3d/view3d_draw.c
source/blender/makesdna/DNA_image_types.h
source/blender/makesdna/DNA_userdef_types.h
source/blender/makesrna/intern/rna_image.c
source/blender/makesrna/intern/rna_render.c
source/blender/render/extern/include/RE_pipeline.h
source/blender/render/intern/source/pipeline.c
source/blender/render/intern/source/render_result.c

Fix for crashes on release build when rendering, big kudos for Lukas Toenne

Merge remote-tracking branch 'origin/master' into multiview

Conflicts:
release/datafiles/locale
source/blender/blenloader/intern/versioning_270.c

Change Viewport "stereo 3d" option for Multi-View scene setup

This may not be clear enough, and I still want to run this by Francesco Siddi. But basically the idea here is that when using the Multi-View option you should only get the option to see the "Stereo 3D" (when there is a left and right cameras) or the "views" which is the current selected view

Missing file from the last renamse (basic stereo > stereo 3d / advanced stereo > multiview)

Rename 'Basic Stereo'/'Advanced Stereo' to 'Stereo 3D'/'Multi-View'

Viewport 3D: support for Volume drawing for Advanced Setup (Multi-View) too

(and flipped red-cyan volume colors to match what you see from the
camera)

Use Red-Cyan for the volume drawing

Viewport 3D: Drawing of Stereo Cameras, Convergence Plane and Volume

This also includes:
* Unification of the view_matrix and model_matrix functions.
* Fix for Toe-in formula
* Fix for viewport bug when camera scale was not uniform

Merge remote-tracking branch 'origin/master' into multiview

Conflicts:
source/blender/render/intern/source/pipeline.c

Fix individual images saving having color management applied to one views (caminandes bug)

(and some code shuffling around)

Note: the only part of save_image_doit that is not fully ok is when the
user save a stereo encoded format (e.g., Anaglyph) and has the 'save as
copy' option unchecked. Personally I think we shouldn't support this
combination (user looses data this way), or we should re-load the image
(which is not nice if the format is lossly like jpeg).