Blender Git Loki

Git Commits -> Revision 296d059

Revision 296d059 by Julian Eisel (soc-2016-layer_manager)

July 11, 2016, 13:53 (GMT)

Merge branch 'master' into soc-2016-layer_manager

And make manual adjustments of merged parts to fit changes in branch.
Conflicts:
source/blender/blenkernel/intern/library_remap.c
source/blender/blenkernel/intern/object.c
source/blender/editors/animation/anim_filter.c

Commit Details:

Full Hash: 296d0592e1253e220a20b6728c3bfb1510af3764
Parent Commits: 417f069, cb3b197

Blender Git Loki

Git Commits -> Revision 296d059

Commit Details:

Valikko

Tilastot

RSS Syötteet

Blender Git Loki

Git Commits -> Revision 296d059 Go

Commit Details:

Valikko

Tilastot

RSS Syötteet

Git Commits -> Revision 296d059