svn merge ^/trunk/blender -r43009:43033

2011-12-31 12:03:36 +00:00
parent 81f5c9ed9b bac6757ea0
commit 78a4e24614
52 changed files with 15989 additions and 6384 deletions
--- a/source/blender/modifiers/intern/MOD_util.c
+++ b/source/blender/modifiers/intern/MOD_util.c
@@ -276,6 +276,7 @@ void modifier_type_init(ModifierTypeInfo *types[])
 	INIT_TYPE(WeightVGMix);
 	INIT_TYPE(WeightVGProximity);
 	INIT_TYPE(DynamicPaint);
+	INIT_TYPE(Remesh);
 	INIT_TYPE(NgonInterp);
 #undef INIT_TYPE
 }