Commit: 31d0960734c2b2641d4fc5c978c5a4c2e2412930
Author: Lukas Tönne
Date: Fri Dec 4 17:17:52 2015 +0100
Branches: object_nodes
https://developer.blender.org/rB31d0960734c2b2641d4fc5c978c5a4c2e2412930
Merge branch 'master' into object_nodes
Conflicts:
source/blender/makesrna/intern/rna_nodetree.c
===================================================================
===================================================================
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
