Blender Git Loki

missing semicolon

Revert "missing semicolon"

This reverts commit 1053539f4dbe4ee83a6c689b0d385f0bf42a386d.

missing semicolon

added GPU_glew.h to CMakeLists.txt

made GLEW_CHK extern again (ContextWGL wasn't using it and for some reason I assumed the other contexts didn't need it either)

renaming of processed density field files

progress textfield started, stopButton correct

More sensible defaults and ranges for the hair sim settings.

Note that this will probably change again in the future. The goal is to
make the simulation as stable as possible in the default ui range of
properties (artists can override soft limits, but then instability has
to be expected).

Currently spring forces and damping depend somewhat on the time step
size and hair segment length. Also reparameterizing properties a bit
could help to increase accuracy in artistically interesting ranges.

Merge branch 'master' into soc-2014-viewport_context

Conflicts:
intern/ghost/intern/GHOST_WindowWin32.cpp

Fix for scons error: Was missing an opening bracket for the hair
namespace define.

Remove GLEW_CHK - its not defined

Merge remote-tracking branch 'origin' into soc

Conflicts:
source/blender/blenloader/intern/versioning_270.c

Add two buttons on modifier, first button to compute flow. second button to remeshing.

Another iteration for Modal Blend From Shape

Fix cycles render layers.

Cycles supports 3 channels and 4 channels colors, compositor only 4 channel.
compositor will use vector to store the 3 channel colors.

Simplify some 2d vector use

Minor changes, sync with master

multiview: bug when saving image

When I implement the OpenEXR changes I will revisit save_image_doit and
do a final cleanup. But for now it's working again as it should.

unused file deleted

imorting mantaflow correctly in Unix