Merge branch 'master' into blender2.8

2017-08-01 10:38:36 +10:00
parent b71366801e a372638a76
commit 8ddaa6a4e2
42 changed files with 172 additions and 82 deletions
--- a/source/blender/modifiers/intern/MOD_multires.c
+++ b/source/blender/modifiers/intern/MOD_multires.c
@@ -46,6 +46,8 @@
 #include "BKE_modifier.h"
 #include "BKE_subsurf.h"

+#include "MOD_modifiertypes.h"
+
 static void initData(ModifierData *md)
 {
 	MultiresModifierData *mmd = (MultiresModifierData *)md;