diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2016-09-23 14:05:11 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2016-09-23 15:25:15 +0300 |
| commit | 776a8548f03a049d56f19943e6bc4590ecd53028 (patch) | |
| tree | c86f2b03a08f5b69f850330d69516077e1b80ee9 /source/blender/blenkernel/intern/object.c | |
| parent | 2372e67dd6a2231869ec50d7bf382006be7141de (diff) | |
Fix T49430: append scene with gamelogic broken.
In fact, it was the whole remapping process that was broken in logic bricks area,
due to terrible design of links between those bricks...
Object copying was also broken in that case, fixed as well.
To be backported to 2.78.
Note that issue was actually probably there since ages, hidden behind dirty hacks
used in previous append code (though likely visible in some corner cases).
Listen kids: do not, never, ever, do what has been done for links between logic bricks. Never. Ever.
Even as pure runtime data it would have been bad, but as stored data...
Diffstat (limited to 'source/blender/blenkernel/intern/object.c')
| -rw-r--r-- | source/blender/blenkernel/intern/object.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/source/blender/blenkernel/intern/object.c b/source/blender/blenkernel/intern/object.c index cdd7560e3c4..d87c257d555 100644 --- a/source/blender/blenkernel/intern/object.c +++ b/source/blender/blenkernel/intern/object.c @@ -1118,11 +1118,9 @@ Object *BKE_object_copy_ex(Main *bmain, Object *ob, bool copy_caches) BLI_listbase_clear(&obn->prop); BKE_bproperty_copy_list(&obn->prop, &ob->prop); - - copy_sensors(&obn->sensors, &ob->sensors); - copy_controllers(&obn->controllers, &ob->controllers); - copy_actuators(&obn->actuators, &ob->actuators); - + + BKE_sca_logic_copy(obn, ob); + if (ob->pose) { copy_object_pose(obn, ob); /* backwards compat... non-armatures can get poses in older files? */ |