Bastien Montagne 97ee7f8609 Merge branch 'master' into blender2.8 ...

Conflicts:
	source/blender/blenloader/intern/readfile.c
	source/blender/editors/physics/particle_edit.c

2016-06-22 13:12:44 +02:00

..

avi

Remove SCons building system

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

blenfont

GPU: fix/workaround basic shader font-color

2016-06-08 15:20:57 +10:00

blenkernel

Merge branch 'master' into blender2.8

2016-06-22 13:12:44 +02:00

blenlib

Cleanup: style

2016-06-22 14:02:51 +10:00

blenloader

Merge branch 'master' into blender2.8

2016-06-22 13:12:44 +02:00

blentranslation

Merge branch 'master' into blender2.8

2016-05-24 16:48:10 +02:00

bmesh

Fix null-pointer free

2016-06-22 05:34:04 +10:00

collada

Cleanup: style, whitespace, doxy filepaths

2016-06-19 06:33:29 +10:00

compositor

Fix T48589: Compositor Backdrop crashes Blender

2016-06-07 16:44:15 +02:00

datatoc

CMake: Ignore paranoid MSVC linker warnings

2016-02-20 14:06:09 +05:00

depsgraph

Merge branch 'master' into blender2.8

2016-06-22 13:12:44 +02:00

editors

Merge branch 'master' into blender2.8

2016-06-22 13:12:44 +02:00

freestyle

Cleanup: style, whitespace, doxy filepaths

2016-06-19 06:33:29 +10:00

gpu

Merge branch 'master' into blender2.8

2016-06-22 13:12:44 +02:00

ikplugin

Remove SCons building system

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

imbuf

Cleanup: style

2016-06-22 14:02:51 +10:00

makesdna

Merge branch 'master' into blender2.8

2016-06-22 13:12:44 +02:00

makesrna

Merge branch 'master' into blender2.8

2016-06-22 13:12:44 +02:00

modifiers

Merge branch 'master' into blender2.8

2016-06-10 05:15:06 +10:00

nodes

Merge branch 'master' into blender2.8

2016-06-21 12:14:49 +10:00

physics

Fix cloth stability when in perfect rest shape.

2016-06-08 10:32:11 +02:00

python

bmesh py api: expose BM_face_calc_tangent_*

2016-06-12 15:12:34 +10:00

quicktime

Remove SCons building system

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

render

World space switch for BI nodes.

2016-06-07 10:21:55 +02:00

windowmanager

Merge branch 'master' into blender2.8

2016-06-22 13:12:44 +02:00

CMakeLists.txt

Removed remaining use of pointers to particle types as well as boids headers.

2016-04-13 18:10:23 +02:00