Bastien Montagne
11af9e9a5b
Merge branch 'master' into blender2.8
Conflicts:
intern/cycles/blender/blender_curves.cpp
intern/cycles/blender/blender_particles.cpp
source/blender/depsgraph/intern/builder/deg_builder_relations.h
source/blender/depsgraph/intern/depsgraph_build.cc
2016-06-01 14:34:11 +02:00
..
2016-05-31 16:30:44 +10:00
2016-04-19 22:53:18 +02:00
2016-05-31 16:30:44 +10:00
2016-04-19 12:18:19 +10:00
2015-12-08 18:58:52 +01:00
2015-06-01 16:40:43 +10:00
2016-06-01 00:19:01 +10:00
2016-04-19 22:53:18 +02:00
2016-02-21 02:10:29 +01:00
2016-02-02 14:16:53 +11:00
2016-04-16 17:27:49 +02:00
2015-10-20 15:42:30 +11:00
2015-04-07 15:43:06 -03:00