[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [36205] trunk/blender/source/blender/ makesrna/intern/rna_object.c: object. collision was allocating on access for all object types - camera could get collision data for eg .
Campbell Barton
ideasman42 at gmail.com
Mon Apr 18 03:45:30 CEST 2011
Revision: 36205
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=36205
Author: campbellbarton
Date: 2011-04-18 01:45:28 +0000 (Mon, 18 Apr 2011)
Log Message:
-----------
object.collision was allocating on access for all object types - camera could get collision data for eg.
now check for mesh types only.
any other type will return None.
Modified Paths:
--------------
trunk/blender/source/blender/makesrna/intern/rna_object.c
Modified: trunk/blender/source/blender/makesrna/intern/rna_object.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_object.c 2011-04-18 01:40:45 UTC (rev 36204)
+++ trunk/blender/source/blender/makesrna/intern/rna_object.c 2011-04-18 01:45:28 UTC (rev 36205)
@@ -1059,6 +1059,9 @@
{
Object *ob= (Object*)ptr->id.data;
+ if(ob->type != OB_MESH)
+ return PointerRNA_NULL;
+
/* weak */
if(!ob->pd)
ob->pd= object_add_collision_fields(0);
More information about the Bf-blender-cvs
mailing list