Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2011-10-27 01:22:35 +0400
committerCampbell Barton <ideasman42@gmail.com>2011-10-27 01:22:35 +0400
commita267f9ba4e7904c6e32e062aaccc282d974643bf (patch)
tree6ec0d31ecf6359652a69c1c497265d60e6f0b0a3 /source/blender/blenkernel/intern/action.c
parentba0ef7a592ace7d6baa5c5f1342706de4e70b2e8 (diff)
edits ontop of Alex's patch from r41292.
pass main rather than use G.main when naming from -> to relative paths.
Diffstat (limited to 'source/blender/blenkernel/intern/action.c')
-rw-r--r--source/blender/blenkernel/intern/action.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/blenkernel/intern/action.c b/source/blender/blenkernel/intern/action.c
index ac0697ddbf9..d02a1d6dd27 100644
--- a/source/blender/blenkernel/intern/action.c
+++ b/source/blender/blenkernel/intern/action.c
@@ -137,14 +137,14 @@ void make_local_action(bAction *act)
// XXX: double-check this; it used to be just single-user check, but that was when fake-users were still default
if ((act->id.flag & LIB_FAKEUSER) && (act->id.us<=1)) {
- id_clear_lib_data(&bmain->action, (ID *)act);
+ id_clear_lib_data(bmain, (ID *)act);
return;
}
BKE_animdata_main_cb(bmain, make_localact_init_cb, &mlac);
if (mlac.local && mlac.lib==0) {
- id_clear_lib_data(&bmain->action, (ID *)act);
+ id_clear_lib_data(bmain, (ID *)act);
}
else if (mlac.local && mlac.lib) {
mlac.actn= copy_action(act);