Revision: 30499
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=30499
Author: aligorith
Date: 2010-07-19 14:37:55 +0200 (Mon, 19 Jul 2010)
Log Message:
-----------
Bullet SoC - Fixed crash when moving objects with Rigid Bodies to other layers
Modified Paths:
--------------
branches/soc-2010-aligorith-2/source/blender/editors/physics/rigidbody_object.c
Modified:
branches/soc-2010-aligorith-2/source/blender/editors/physics/rigidbody_object.c
===================================================================
---
branches/soc-2010-aligorith-2/source/blender/editors/physics/rigidbody_object.c
2010-07-19 11:47:46 UTC (rev 30498)
+++
branches/soc-2010-aligorith-2/source/blender/editors/physics/rigidbody_object.c
2010-07-19 12:37:55 UTC (rev 30499)
@@ -66,8 +66,10 @@
int ED_operator_rigidbody_active_poll(bContext *C)
{
- if (ED_operator_object_active_editable(C))
- return (CTX_data_active_object(C)->rigidbodySettings != NULL);
+ if (ED_operator_object_active_editable(C)) {
+ Object *ob = CTX_data_active_object(C);
+ return (ob && ob->rigidbodySettings);
+ }
else
return 0;
}
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
