remove checks on deprecated multires pointer.
authorCampbell Barton <ideasman42@gmail.com>
Thu, 21 Apr 2011 08:55:10 +0000 (08:55 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Thu, 21 Apr 2011 08:55:10 +0000 (08:55 +0000)
source/blender/blenkernel/intern/particle.c
source/blender/editors/mesh/editmesh_mods.c
source/blender/makesdna/DNA_mesh_types.h

index 52b8cc194f7070b7e5b7e1bf9ff0b1b12857bb55..ac9c46511a655ea394c0b1742d7e7026d49ddeb6 100644 (file)
@@ -269,12 +269,6 @@ int psys_check_enabled(Object *ob, ParticleSystem *psys)
        if(psys->flag & PSYS_DISABLED || psys->flag & PSYS_DELETE || !psys->part)
                return 0;
 
-       if(ob->type == OB_MESH) {
-               me= (Mesh*)ob->data;
-               if(me->mr && me->mr->current != 1)
-                       return 0;
-       }
-
        psmd= psys_get_modifier(ob, psys);
        if(psys->renderdata || G.rendering) {
                if(!(psmd->modifier.mode & eModifierMode_Render))
index 050832cf8f606ebb4d282acb42ba9ee3c9319c3a..789c5c9c749d6aeb64da50d8e201901d94fbf545 100644 (file)
@@ -140,8 +140,7 @@ void EM_automerge(Scene *scene, Object *obedit, int update)
        int len;
 
        if ((scene->toolsettings->automerge) &&
-               (obedit && obedit->type==OB_MESH && (obedit->mode & OB_MODE_EDIT)) &&
-               (me->mr==NULL)
+               (obedit && obedit->type==OB_MESH && (obedit->mode & OB_MODE_EDIT))
          ) {
                EditMesh *em= me->edit_mesh;
 
index ae7f5e65316b94c0928bd648d1bf700060316c22..6ad60ac2df9c1f9baf025c68dbd04266c54e9790 100644 (file)
@@ -100,7 +100,7 @@ typedef struct Mesh {
 
        short totcol;
 
-       struct Multires *mr;            /* Multiresolution modeling data */
+       struct Multires *mr;            /* deprecated multiresolution modeling data, only keep for loading old files */
        struct PartialVisibility *pv;
 } Mesh;