[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [36264] trunk/blender/source/blender/ blenkernel/intern: following on from last commit r36263.
Campbell Barton
ideasman42 at gmail.com
Thu Apr 21 11:38:09 CEST 2011
Revision: 36264
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=36264
Author: campbellbarton
Date: 2011-04-21 09:38:09 +0000 (Thu, 21 Apr 2011)
Log Message:
-----------
following on from last commit r36263.
copying metaball, lattice and armature datablocks while in editmode could segfault when they were freed, NULL these pointers on copy.
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=36263
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/intern/armature.c
trunk/blender/source/blender/blenkernel/intern/curve.c
trunk/blender/source/blender/blenkernel/intern/lattice.c
trunk/blender/source/blender/blenkernel/intern/mball.c
Modified: trunk/blender/source/blender/blenkernel/intern/armature.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/armature.c 2011-04-21 09:03:04 UTC (rev 36263)
+++ trunk/blender/source/blender/blenkernel/intern/armature.c 2011-04-21 09:38:09 UTC (rev 36264)
@@ -214,6 +214,11 @@
};
newArm->act_bone= newActBone;
+
+ newArm->edbo= NULL;
+ newArm->act_edbone= NULL;
+ newArm->sketch= NULL;
+
return newArm;
}
Modified: trunk/blender/source/blender/blenkernel/intern/curve.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/curve.c 2011-04-21 09:03:04 UTC (rev 36263)
+++ trunk/blender/source/blender/blenkernel/intern/curve.c 2011-04-21 09:38:09 UTC (rev 36264)
@@ -201,6 +201,7 @@
cun->editnurb= NULL;
cun->editfont= NULL;
+ cun->selboxes= NULL;
#if 0 // XXX old animation system
/* single user ipo too */
Modified: trunk/blender/source/blender/blenkernel/intern/lattice.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/lattice.c 2011-04-21 09:03:04 UTC (rev 36263)
+++ trunk/blender/source/blender/blenkernel/intern/lattice.c 2011-04-21 09:38:09 UTC (rev 36264)
@@ -219,7 +219,9 @@
ltn->dvert = MEM_mallocN (sizeof (MDeformVert)*tot, "Lattice MDeformVert");
copy_dverts(ltn->dvert, lt->dvert, tot);
}
-
+
+ ltn->editlatt= NULL;
+
return ltn;
}
Modified: trunk/blender/source/blender/blenkernel/intern/mball.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/mball.c 2011-04-21 09:03:04 UTC (rev 36263)
+++ trunk/blender/source/blender/blenkernel/intern/mball.c 2011-04-21 09:38:09 UTC (rev 36264)
@@ -132,6 +132,9 @@
id_us_plus((ID *)mbn->mat[a]);
}
mbn->bb= MEM_dupallocN(mb->bb);
+
+ mbn->editelems= NULL;
+ mbn->lastelem= NULL;
return mbn;
}
More information about the Bf-blender-cvs
mailing list