Bastien Montagne a43ebc63fa Merge branch 'master' into blender2.8 ...

Conflicts:
	source/blender/blenkernel/intern/collision.c

2018-09-03 17:44:36 +02:00

..

nodes

Merge branch 'master' into blender2.8

2018-08-28 19:15:08 +02:00

node_shader_tree.c

GPUMaterial: Make Localize tree live longer

2018-08-01 22:08:36 +02:00

node_shader_util.c

Merge branch 'master' into blender2.8

2018-09-03 17:44:36 +02:00

node_shader_util.h

GPU: avoid unnecessary multiple nodetree localize and output finding.

2018-07-05 17:51:58 +02:00