Bastien Montagne 45f3150c98 Merge branch 'master' into blender2.8 ...

Conflicts:
	source/blender/editors/space_view3d/drawobject.c

2017-04-10 17:34:31 +02:00

..

atomic

Cleanup: Use explicit unsigned int in atomics

2017-03-01 12:01:19 +01:00

audaspace

Fix T50843: Pitched Audio renders incorrectly in VSE

2017-03-05 12:19:32 +01:00

container

Remove SCons building system

2016-01-04 14:20:48 +05:00

cycles

Merge branch 'master' into blender2.8

2017-04-10 17:34:31 +02:00

decklink

Cleanup: code style & cmake

2017-03-12 02:47:53 +11:00

dualcon

Remove SCons building system

2016-01-04 14:20:48 +05:00

eigen

Remove SCons building system

2016-01-04 14:20:48 +05:00

elbeem

Revert particle system and point cache removal in blender2.8 branch.

2016-12-28 17:30:58 +01:00

ffmpeg

FFmpeg: Update for the deprecated API in 3.2.x

2017-03-06 10:34:57 +01:00

gawain

Gawain: remove GL enum from primitive API

2017-04-08 01:19:48 -04:00

ghost

Merge branch 'master' into blender2.8

2017-03-28 10:41:10 +02:00

glew-mx

Add stubs to build WITH_GL_PROFILE_CORE

2017-04-10 08:45:00 +02:00

gpudirect

Cleanup: comment blocks

2016-07-02 10:08:33 +10:00

guardedalloc

Atomics: Make naming more obvious about which value is being returned

2016-11-15 12:16:26 +01:00

iksolver

FIX T49899: Add EIGEN_MAKE_ALIGNED_OPERATOR_NEW to classes that use eigen's data types , to force aligned on 16 byte boundaries.

2016-11-15 13:21:01 -07:00

itasc

Cleanup: Reduce amount of misleading indentation

2016-09-01 12:14:16 +02:00

libmv

Libmv: Correction to previous commit

2017-04-07 17:57:48 +02:00

locale

Cleanup: Unused function

2017-04-07 12:55:04 +02:00

memutil

Remove SCons building system

2016-01-04 14:20:48 +05:00

mikktspace

Fix T49523: very slow normal map tangent computation for rendering in 2.78.

2016-10-06 03:12:04 +02:00

moto

BGE: Various render improvements.

2016-06-11 22:05:20 +02:00

opencolorio

Cleanup: glsl indentation

2017-04-09 16:36:39 +10:00

opensubdiv

OpensSubdiv: Cleanup, unused argument

2016-12-20 12:29:41 +01:00

openvdb

Fix T48236: OpenVDB smoke cache glitches out with smokeless flames.

2016-04-22 11:46:02 +02:00

rigidbody

Remove SCons building system

2016-01-04 14:20:48 +05:00

smoke

Cleanup: Strict CLang warning in Smoke module

2017-01-09 13:12:43 +01:00

string

Fix STR_String Capitalize on non Win32

2016-12-15 12:58:19 +11:00

utfconv

C++ conformance fixes (MSVC /permissive-)

2017-02-06 10:44:56 +01:00

CMakeLists.txt

move Gawain library to intern

2017-03-16 23:32:35 -04:00