Bastien Montagne 3af98b4c04 Merge branch 'master' into blender2.8 ...

Conflicts:
	intern/cycles/blender/CMakeLists.txt
	source/blender/editors/gpencil/drawgpencil.c
	source/blender/editors/physics/physics_ops.c

2016-12-17 13:07:00 +01:00

..

BlenderRoutines

BGE: remove calls to GLSL support query (it's always supported)

2016-10-10 01:19:10 -04:00

Converter

Cleanup/Refactor: pass Main pointer to all ID copy functions.

2016-07-10 14:52:00 +02:00

Expressions

Cleanup: comment blocks

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

GameLogic

PyAPI: fix memory leaks in dictionary assignment

2016-07-14 17:30:52 +10:00

GamePlayer

BGE: remove calls to GLSL support query (it's always supported)

2016-10-10 01:19:10 -04:00

Ketsji

BGE: remove calls to GLSL support query (it's always supported)

2016-10-10 01:19:10 -04:00

Network

Remove SCons building system

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

Physics

Cleanup: comment blocks

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

Rasterizer

Fix T49520: broken vertex colors in the game engine.

2016-10-01 22:41:46 +02:00

SceneGraph

Remove SCons building system

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

VideoTexture

BGE: Fix T50098: Crash when useding ImageMirror

2016-12-14 20:07:51 +01:00

CMakeLists.txt

CMake: Enable strict flags for C++

2015-03-27 18:23:31 +05:00