svn merge -r 13452:14721 https://svn.blender.org/svnroot/bf-blender/trunk/blender
[blender-staging.git] / source / blender / blenkernel / intern / modifier.c
index ca95d9edc0695d89dd0d020bc4f7f1201ee3a221..2a8ba878c4170dae69a8b28a860740348e05a340 100644 (file)
@@ -5515,6 +5515,7 @@ static void particleSystemModifier_deformVerts(
        DerivedMesh *dm = derivedData;
        ParticleSystemModifierData *psmd= (ParticleSystemModifierData*) md;
        ParticleSystem * psys=0;
+       Mesh *me;
        int needsFree=0;
 
        if(ob->particlesystem.first)
@@ -5522,6 +5523,14 @@ static void particleSystemModifier_deformVerts(
        else
                return;
        
+       /* multires check */
+       if(ob->type == OB_MESH) {
+               me= (Mesh*)ob->data;
+               if(me->mr && me->mr->current != 1)
+                       modifier_setError(md,
+                               "Particles only supported on first multires level.");
+       }
+
        if(!psys_check_enabled(ob, psys))
                return;