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

Conflicts:
	intern/cycles/blender/blender_particles.cpp
	source/blender/blenkernel/intern/particle.c
	source/blender/gpu/intern/gpu_shader.c

2016-09-04 16:41:06 +02:00

..

BlenderRoutines

BGE: Various render improvements.

2016-06-11 22:05:20 +02: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

Fix T49196

2016-08-29 13:33:30 -06:00

Ketsji

Merge branch 'master' into blender2.8

2016-08-21 13:18:26 +02: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

Cleanup: comment blocks

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

SceneGraph

Remove SCons building system

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

VideoTexture

Cleanup: comment blocks

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

CMakeLists.txt

CMake: Enable strict flags for C++

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