Blender Git Loki

use BLI_str_rpartition() instead of my own (thanks Campbell) - and the code seems to be UTF8-safe :)

Revert "D765: Blender input method editor support for windows (diff #7)."

This reverts commit 7816dfc782e3b46280001e837049b235903e6823.

D765: Blender input method editor support for windows (diff #7).

Image Editor saving of image in 3d (individual views) working

Note: I need to go over this function again to see if I'm handling the
'save as copy' == false correctly. If the image is saved to a
destructive format, in that case we should change the current image (and
I'm almost sure I overlooked that).

This function can likely be simplified as well now that I'm more
comfortable with the whole image pipeline.

Packing of multiview images working

Notes:
* This will pack multiple images if the format is R_IMF_VIEWS_INDIVIDUAL
* When packing as PNG we convert the views_format to R_IMF_VIEWS_INDIVIDUAL
* Technically we could use the same principle to pack a sequence of images (with some changes of course, since this approach relies on ImageView

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

preset update (covering newer settings) and inner vgroup now usable without inner material; but not very useful, hmm (because at higher shardcounts the entire object is selected, due to vgroup selection mechanism)

Reenabled air drag force for cloth sim.

Arbitrary scaling factor for the structural spring forces (stretching).

This is not nice at all, but for some reason (possibly time scale) the
old force values are much too high and cause the solver to become
unstable. These will be revisited later anyway, so for now such scaling
should be fine.

Stereo 3d Movie support

Merge branch 'master' into temp_custom_loop_normals

inner faces are added to the existing active UVMap now

remove ambiguity in if statement

Image Editor saving of Image in 3d working (it was working for RenderResult images only in the past)

Switched to the modified CG method that supports constraints, and
added back structural stretch springs.

Generated Images only give 3d option if scene is Multiview

Merge branch 'master' into soc-2014-viewport_fx

I have resolved some differences, for instance selection code which was more or less a stub, to be
the same as master. This will have to be fixed later.

Conflicts:
CMakeLists.txt
intern/ghost/CMakeLists.txt
intern/ghost/intern/GHOST_SystemWin32.cpp
intern/ghost/intern/GHOST_Window.cpp
intern/ghost/intern/GHOST_WindowWin32.cpp
intern/ghost/intern/GHOST_WindowX11.cpp
source/blender/blenlib/BLI_math_matrix.h
source/blender/blenlib/intern/math_matrix.c
source/blender/gpu/CMakeLists.txt
source/blender/gpu/GPU_select.h
source/blender/gpu/intern/gpu_buffers.c
source/blender/gpu/intern/gpu_draw.c
source/blender/gpu/intern/gpu_extensions.c
source/blender/gpu/intern/gpu_select.c
source/blender/gpu/shaders/gpu_shader_simple_vert.glsl
source/blender/nodes/CMakeLists.txt

Import of all stereo encoded formats (anaglyph, interlace, top-bottom, ...)

This is supported at the moment for single-layer formats only. It works
fine though. The user must be aware that some formats are
highly-destructive and won't never be recovered 1:1 (e.g., interlace and
anaglyph)

Fix compilation on linux (Ubuntu 14.04 used here).

first attempt of adding UVs to inner faces, need to pack them correctly still and put into separate UV Map....