Commit: 72ff78a9515255c1b687ad3fd63d169ef5c27355 Author: Clément Foucault Date: Wed Jan 25 12:28:52 2017 +0100 Branches: clay-engine https://developer.blender.org/rB72ff78a9515255c1b687ad3fd63d169ef5c27355
Merge branch 'render-layers' of git.blender.org:blender into clay-engine # Conflicts: # source/blender/editors/space_view3d/drawobject.c =================================================================== =================================================================== _______________________________________________ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org https://lists.blender.org/mailman/listinfo/bf-blender-cvs
