archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

remove checks on deprecated multires pointer.

Browse Source
This commit is contained in:
Campbell Barton
2011-04-21 08:55:10 +00:00
parent c3d1e1f3e9
commit cb06c4eee1
3 changed files with 2 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
source/blender/blenkernel/intern/particle.c
View 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))

3
source/blender/editors/mesh/editmesh_mods.c
View 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;

2
source/blender/makesdna/DNA_mesh_types.h
View 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;