Bastien Montagne
f874aeef70
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
2016-12-29 20:05:22 +01:00
..
2016-12-28 17:30:58 +01:00
2015-01-29 15:35:06 +11:00
2016-08-06 10:58:13 +02:00
2016-09-16 18:21:25 +02:00
2016-08-01 11:55:06 +10:00
2016-05-18 10:56:57 +02:00
2016-07-15 15:50:42 +10:00
2015-01-29 15:35:06 +11:00
2016-03-13 02:05:36 +01:00
2015-01-29 15:35:06 +11:00
2016-10-31 15:31:47 +01:00
2015-01-29 15:35:06 +11:00
2016-12-28 17:30:58 +01:00
2015-01-29 15:35:06 +11:00
2015-09-01 13:03:38 +10:00
2016-07-27 19:00:35 -07:00
2016-11-11 14:04:04 +01:00
2015-04-22 16:26:54 +10:00
2015-05-22 16:03:38 +02:00
2015-01-29 15:35:06 +11:00
2016-12-28 17:30:58 +01:00
2016-12-28 17:30:58 +01:00
2016-12-28 17:30:58 +01:00
2016-12-28 17:30:58 +01:00
2016-12-28 17:30:58 +01:00
2016-07-27 19:00:35 -07:00
2016-07-27 19:00:35 -07:00
2016-11-07 12:59:12 +03:00
2016-07-27 19:00:35 -07:00
2016-12-28 17:30:58 +01:00
2016-12-28 17:30:58 +01:00
2015-08-08 20:55:51 +02:00
2016-09-21 15:03:11 +02:00
2016-12-28 17:30:58 +01:00
2016-12-28 17:30:58 +01:00
2016-07-27 19:00:35 -07:00
2016-08-23 11:53:35 +02:00
2016-06-22 07:47:30 +10:00
2016-12-28 17:30:58 +01:00
2015-10-16 11:21:12 +02:00
2016-06-24 03:18:34 +12:00
2016-11-15 16:07:32 +01:00
2016-12-01 17:19:58 +01:00
2016-06-22 07:47:30 +10:00
2016-07-08 01:47:32 +12:00
2016-08-03 23:39:36 +02:00
2016-06-22 07:47:30 +10:00
2014-01-27 18:42:11 +11:00
2016-08-03 23:39:36 +02:00
2016-06-22 07:47:30 +10:00
2016-12-28 17:30:58 +01:00
2016-12-29 01:09:11 -05:00
2016-12-28 17:30:58 +01:00
2016-12-28 17:30:58 +01:00