[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [36262] trunk/blender/source/blender: remove checks on deprecated multires pointer.

[Campbell Barton]

Revision: 36262
          
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=36262
Author:   campbellbarton
Date:     2011-04-21 08:55:10 +0000 (Thu, 21 Apr 2011)
Log Message:
-----------
remove checks on deprecated multires pointer.

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/particle.c
    trunk/blender/source/blender/editors/mesh/editmesh_mods.c
    trunk/blender/source/blender/makesdna/DNA_mesh_types.h

Modified: trunk/blender/source/blender/blenkernel/intern/particle.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/particle.c   2011-04-21 
06:37:54 UTC (rev 36261)
+++ trunk/blender/source/blender/blenkernel/intern/particle.c   2011-04-21 
08:55:10 UTC (rev 36262)
@@ -269,12 +269,6 @@
        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))

Modified: trunk/blender/source/blender/editors/mesh/editmesh_mods.c
===================================================================
--- trunk/blender/source/blender/editors/mesh/editmesh_mods.c   2011-04-21 
06:37:54 UTC (rev 36261)
+++ trunk/blender/source/blender/editors/mesh/editmesh_mods.c   2011-04-21 
08:55:10 UTC (rev 36262)
@@ -140,8 +140,7 @@
        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;
 

Modified: trunk/blender/source/blender/makesdna/DNA_mesh_types.h
===================================================================
--- trunk/blender/source/blender/makesdna/DNA_mesh_types.h      2011-04-21 
06:37:54 UTC (rev 36261)
+++ trunk/blender/source/blender/makesdna/DNA_mesh_types.h      2011-04-21 
08:55:10 UTC (rev 36262)
@@ -100,7 +100,7 @@
 
        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;
 

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs