[Bf-blender-cvs] [9be4cd5] alembic_basic_io: Merge branch 'master' into alembic_basic_io
Kévin Dietrich
noreply at git.blender.org
Thu Jul 21 17:32:18 CEST 2016
Commit: 9be4cd52a795c1139700348be1bcc5d38150f0e5
Author: Kévin Dietrich
Date: Thu Jul 21 17:12:09 2016 +0200
Branches: alembic_basic_io
https://developer.blender.org/rB9be4cd52a795c1139700348be1bcc5d38150f0e5
Merge branch 'master' into alembic_basic_io
Conflicts:
source/blender/blenkernel/intern/library.c
===================================================================
===================================================================
diff --cc source/blender/blenkernel/intern/library.c
index 54bb080,c31df68..39bdb10
--- a/source/blender/blenkernel/intern/library.c
+++ b/source/blender/blenkernel/intern/library.c
@@@ -352,11 -404,14 +407,16 @@@ bool id_make_local(Main *bmain, ID *id
case ID_WM:
return false; /* can't be linked */
case ID_GD:
- return false; /* not implemented */
+ if (!test) BKE_gpencil_make_local(bmain, (bGPdata *)id, lib_local);
+ return true;
+ case ID_MSK:
+ if (!test) BKE_mask_make_local(bmain, (Mask *)id, lib_local);
+ return true;
case ID_LS:
- return false; /* not implemented */
+ if (!test) BKE_linestyle_make_local(bmain, (FreestyleLineStyle *)id, lib_local);
+ return true;
+ case ID_CF:
+ return false; /* not implemented */
}
return false;
More information about the Bf-blender-cvs
mailing list