diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-04-21 12:55:10 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-04-21 12:55:10 +0400 |
| commit | cb06c4eee17a9724cf39f9694c1e68581dcb1a12 (patch) | |
| tree | dd8f001cd874f389b9e2d9f6ac303a4d5d2bee16 | |
| parent | c3d1e1f3e90a8ec56521ba42913763fb81c54f53 (diff) | |
remove checks on deprecated multires pointer.
| -rw-r--r-- | source/blender/blenkernel/intern/particle.c | 6 | ||||
| -rw-r--r-- | source/blender/editors/mesh/editmesh_mods.c | 3 | ||||
| -rw-r--r-- | source/blender/makesdna/DNA_mesh_types.h | 2 |
3 files changed, 2 insertions, 9 deletions
diff --git a/source/blender/blenkernel/intern/particle.c b/source/blender/blenkernel/intern/particle.c index 52b8cc194f7..ac9c46511a6 100644 --- a/source/blender/blenkernel/intern/particle.c +++ b/source/blender/blenkernel/intern/particle.c @@ -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)) diff --git a/source/blender/editors/mesh/editmesh_mods.c b/source/blender/editors/mesh/editmesh_mods.c index 050832cf8f6..789c5c9c749 100644 --- a/source/blender/editors/mesh/editmesh_mods.c +++ b/source/blender/editors/mesh/editmesh_mods.c @@ -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; diff --git a/source/blender/makesdna/DNA_mesh_types.h b/source/blender/makesdna/DNA_mesh_types.h index ae7f5e65316..6ad60ac2df9 100644 --- a/source/blender/makesdna/DNA_mesh_types.h +++ b/source/blender/makesdna/DNA_mesh_types.h @@ -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; |