[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [29641] trunk/blender/source/blender/ blenkernel/intern: Fix #22654: Converted curve from mesh disappearing
Sergey Sharybin
g.ulairi at gmail.com
Wed Jun 23 11:58:02 CEST 2010
Revision: 29641
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=29641
Author: nazgul
Date: 2010-06-23 11:58:02 +0200 (Wed, 23 Jun 2010)
Log Message:
-----------
Fix #22654: Converted curve from mesh disappearing
Curve object should have ob->bb=NULL if there is no derivedMesh
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/intern/displist.c
trunk/blender/source/blender/blenkernel/intern/mesh.c
Modified: trunk/blender/source/blender/blenkernel/intern/displist.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/displist.c 2010-06-23 09:14:22 UTC (rev 29640)
+++ trunk/blender/source/blender/blenkernel/intern/displist.c 2010-06-23 09:58:02 UTC (rev 29641)
@@ -1855,6 +1855,12 @@
DM_set_object_boundbox (ob, ob->derivedFinal);
} else {
boundbox_displist (ob);
+
+ /* if there is no derivedMesh, object's boundbox is unneeded */
+ if (ob->bb) {
+ MEM_freeN(ob->bb);
+ ob->bb= NULL;
+ }
}
}
Modified: trunk/blender/source/blender/blenkernel/intern/mesh.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/mesh.c 2010-06-23 09:14:22 UTC (rev 29640)
+++ trunk/blender/source/blender/blenkernel/intern/mesh.c 2010-06-23 09:58:02 UTC (rev 29641)
@@ -1186,6 +1186,12 @@
if (needsFree) {
ob->derivedFinal = NULL;
+
+ /* curve object could have got bounding box only in special cases */
+ if(ob->bb) {
+ MEM_freeN(ob->bb);
+ ob->bb= NULL;
+ }
}
}
More information about the Bf-blender-cvs
mailing list