[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [28389] branches/render25/source/blender/ blenkernel/intern/armature.c: Render Branch: svn merge https://svn.blender. org/svnroot/bf-blender/trunk/blender -r28381:28388

[Brecht Van Lommel]

Revision: 28389
          
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=28389
Author:   blendix
Date:     2010-04-23 20:03:06 +0200 (Fri, 23 Apr 2010)

Log Message:
-----------
Render Branch: svn merge 
https://svn.blender.org/svnroot/bf-blender/trunk/blender -r28381:28388

Modified Paths:
--------------
    branches/render25/source/blender/blenkernel/intern/armature.c

Modified: branches/render25/source/blender/blenkernel/intern/armature.c
===================================================================
--- branches/render25/source/blender/blenkernel/intern/armature.c       
2010-04-23 18:02:50 UTC (rev 28388)
+++ branches/render25/source/blender/blenkernel/intern/armature.c       
2010-04-23 18:03:06 UTC (rev 28389)
@@ -965,7 +965,8 @@
                if(target->type==OB_MESH) {
                        Mesh *me= target->data;
                        dverts = me->dvert;
-                       target_totvert = me->totvert;
+                       if(dverts)
+                               target_totvert = me->totvert;
                }
                else {
                        Lattice *lt= target->data;


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