Campbell Barton 46e1d85e61 Reduce conflicts be keeping same indent-level as master

2016-06-10 05:51:34 +10: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

Flat shading for basic shader

2016-06-10 05:38:17 +10:00

blenlib

Fix T48614: Blender from buildbot crash when Separate selection in this particular scene.

2016-06-09 17:53:51 +02:00

blenloader

Merge branch 'master' into blender2.8

2016-06-07 18:06:46 +10:00

blentranslation

Merge branch 'master' into blender2.8

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

bmesh

Fix bug where corner boundary was straight when it should curve.

2016-06-01 08:51:08 -04:00

collada

changed use_connect from bool to a 3 state value (-1,0,1)

2016-06-03 18:31:51 +02: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-10 05:17:33 +10:00

editors

Reduce conflicts be keeping same indent-level as master

2016-06-10 05:51:34 +10:00

freestyle

C99/C++11: replace deprecated finite() by isfinite().

2016-05-17 21:39:16 +02:00

gpu

Merge branch 'master' into blender2.8

2016-06-10 05:46:29 +10:00

ikplugin

Remove SCons building system

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

imbuf

Cleanup: unused defines

2016-06-01 00:26:14 +10:00

makesdna

World space switch for BI nodes.

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

makesrna

World space switch for BI nodes.

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

modifiers

Merge branch 'master' into blender2.8

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

nodes

World space switch for BI nodes.

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

physics

Fix cloth stability when in perfect rest shape.

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

python

Cleanup: parenthesize defines

2016-06-01 00:19:01 +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-10 05:17:33 +10:00

CMakeLists.txt

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

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