[Bf-blender-cvs] [f874aee] blender2.8: Merge branch 'master' into blender2.8

Bastien Montagne noreply at git.blender.org
Thu Dec 29 20:07:39 CET 2016


Commit: f874aeef70f2f315c3062d9694ae816674d0cdd0
Author: Bastien Montagne
Date:   Thu Dec 29 19:57:42 2016 +0100
Branches: blender2.8
https://developer.blender.org/rBf874aeef70f2f315c3062d9694ae816674d0cdd0

Merge branch 'master' into blender2.8

Please **DO NOT** add changes from master when it's totally uneeded!

Changes to BLI_ area most certainly shall *always* be done in master,
there is absolutely no point in adding more diff between the two
branches than needed, will only makes merging more cumbersome!

Conflicts:
	CMakeLists.txt
	source/blender/blenlib/intern/math_vector_inline.c

===================================================================



===================================================================






More information about the Bf-blender-cvs mailing list