Blender Git Commit Log

Merge branch 'master' into soc-2016-pbvh-painting

Removed unnecessary debug code. Forgot to remove some old code.

Merge remote-tracking branch 'origin/master' into soc-2016-uv_tools

WIP Packing: working concave support.

Functionality is there, still needs optimizations and initial upscaling for best results.
Cleanup commit coming, this will also re-enable iterative computations

Fix T49105: Array modifier displayed in Edit mode crashes on selection, with End Cap enabled.

Origindex can be invalid, code was not fully protected against it...

Fix broken keymap loading with disabled ndof - revert part of recent rBb10d0058d72da30

ifdef?ing out defines in DNA/RNA is not a good idea, was breaking alternative keymaps loading
from splash screen e.g. (reported by Sergey over IRC, thanks).

refactored inflow flag

added gravity field and clean up UI a bit

fixed obstacles for liquids (=blender source - manta liquid script needs some more customizations)

2D stabilization: Make interface more compact

Joins some things to the same row and uses aligned columns to get
minimum use of vertical space.

Probably still some tweaks required, but getting there :)

OpenGL: don't poll for errors, rely on KHR_debug

Errors are caught & reported by our GL debug callback. This gives us way more useful information than sporadic calls to glGetError.

I removed almost all use of glGetError, including our own GPU_ASSERT_NO_GL_ERRORS and GPU_CHECK_ERRORS_AROUND macros.

Still used in rna_Image_gl_load because it passes unvalidated input to OpenGL functions.

Still used in gpu_state_print_fl_ex as an exception handling hack -- will rewrite this soon.

The optimism embodied by this commit will not prevent OpenGL errors. We need to analyze what would cause GL to fail at certain points and proactively intercept these failures. Or guarantee they can't happen.

Alembic: fix crash accessing invalid objects.

Fix T49111: Automatically add file path suffix for Alembic and Collada
export.

This aligns the behaviour of the file selection with the other
exporters. The Alembic case would fail if the filepath did not have an
extension set.

Also set a default file name for the Alembic export operator in case the
Blender file was not saved before exporting.

Cleanup: Remove redundant comment

Make scene copying work with layers

cleaned up a bit in mantaflow scripts

Merge branch 'master' into soc-2016-cycles_images

Revert "Half Floats: Initial support for CUDA."

This reverts commit ef7d3af938514d4dfb7d7c2376c8fa6720c45279.

Cycles: Fix wrong allocator used for spatial builder

Curves: Keymaps

Added keymaps for extend, batch extend, trim, offset, fillet and chamfer tools.