diff options
author | Bastien Montagne <montagne29@wanadoo.fr> | 2018-05-31 17:57:39 +0300 |
---|---|---|
committer | Bastien Montagne <montagne29@wanadoo.fr> | 2018-05-31 17:57:39 +0300 |
commit | 5a82aee9e69ddcfbd4ca704f6566cf7eeec97dec (patch) | |
tree | 91900e6023b47092dfc28236e0425c28f287b7c5 /source/blender | |
parent | 8d53e8cd029dbec02ba9aea1975d6ff780b161df (diff) | |
parent | da11e33b26b6579ef36c97de1b6fbc0eb02a0b69 (diff) |
Merge branch 'master' into blender2.8
Conflicts:
source/blender/alembic/intern/abc_exporter.cc
source/blender/blenkernel/BKE_mball.h
source/blender/blenkernel/intern/depsgraph.c
source/blender/blenkernel/intern/mball.c
source/blender/editors/object/object_add.c
source/blender/render/intern/source/convertblender.c
Diffstat (limited to 'source/blender')
-rw-r--r-- | source/blender/alembic/intern/abc_mball.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/source/blender/alembic/intern/abc_mball.h b/source/blender/alembic/intern/abc_mball.h index 19bf7dc054d..bae4b6bcb76 100644 --- a/source/blender/alembic/intern/abc_mball.h +++ b/source/blender/alembic/intern/abc_mball.h @@ -26,6 +26,7 @@ #include "abc_object.h" class AbcMeshWriter; +struct EvaluationContext; struct Main; struct MetaBall; struct Object; |