[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [44381] trunk/blender/source/blender/ editors/object/object_add.c: Fix #30306: crash duplicating object with action actuator but no animation data.

[Brecht Van Lommel]

Revision: 44381
          
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=44381
Author:   blendix
Date:     2012-02-23 16:12:36 +0000 (Thu, 23 Feb 2012)
Log Message:
-----------
Fix #30306: crash duplicating object with action actuator but no animation data.

Modified Paths:
--------------
    trunk/blender/source/blender/editors/object/object_add.c

Modified: trunk/blender/source/blender/editors/object/object_add.c
===================================================================
--- trunk/blender/source/blender/editors/object/object_add.c    2012-02-23 
16:00:53 UTC (rev 44380)
+++ trunk/blender/source/blender/editors/object/object_add.c    2012-02-23 
16:12:36 UTC (rev 44381)
@@ -1807,7 +1807,7 @@
                                for (act = obn->actuators.first; act; act = 
act->next) {
                                        if(act->type == ACT_ACTION) {
                                                bActionActuator* actact = 
(bActionActuator*) act->data;
-                                               if(actact->act == 
ob->adt->action) {
+                                               if(ob->adt && actact->act == 
ob->adt->action) {
                                                        actact->act = 
obn->adt->action;
                                                }
                                        }

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