This repository has been archived on 2023-10-09. You can view files and clone it. You cannot open issues or pull requests or push a commit.

Bastien Montagne 1f46da922a Merge branch 'master' into blender2.8 ...

Conflicts:
	source/blender/blenloader/intern/versioning_270.c
	source/blender/depsgraph/intern/depsgraph_tag.cc
	source/blender/editors/mask/mask_draw.c

2017-05-19 09:36:14 +02:00

..

nodes

Merge branch 'master' into blender2.8

2017-05-19 09:36:14 +02:00

node_shader_tree.c

Remove tons of OBACT

2017-03-02 17:09:24 +01:00

node_shader_util.c

Node callback for handling link insertion and swapping of occupied inputs.

2015-12-03 13:04:04 +01:00

node_shader_util.h

GPULamp: Separate GPULamp from GPUMaterial

2017-04-03 21:52:03 +02:00