Commit: 928aab7b4e74c9c136fb7e98bc4fcbcd3dcd45c4
Author: Lukas Tönne
Date: Wed Feb 25 17:03:50 2015 +0100
Branches: alembic_pointcache
https://developer.blender.org/rB928aab7b4e74c9c136fb7e98bc4fcbcd3dcd45c4
Make cache libraries a linkable data block.
===================================================================
M source/blender/blenkernel/intern/idcode.c
M source/blender/editors/space_file/filelist.c
===================================================================
diff --git a/source/blender/blenkernel/intern/idcode.c
b/source/blender/blenkernel/intern/idcode.c
index fbd2359..47a4414 100644
--- a/source/blender/blenkernel/intern/idcode.c
+++ b/source/blender/blenkernel/intern/idcode.c
@@ -53,7 +53,7 @@ static IDType idtypes[] = {
{ ID_AC, "Action", "actions",
IDTYPE_FLAGS_ISLINKABLE },
{ ID_AR, "Armature", "armatures",
IDTYPE_FLAGS_ISLINKABLE },
{ ID_BR, "Brush", "brushes",
IDTYPE_FLAGS_ISLINKABLE },
- { ID_CL, "CacheLibrary", "cache_libraries", 0
},
+ { ID_CL, "CacheLibrary", "cache_libraries",
IDTYPE_FLAGS_ISLINKABLE },
{ ID_CA, "Camera", "cameras",
IDTYPE_FLAGS_ISLINKABLE },
{ ID_CU, "Curve", "curves",
IDTYPE_FLAGS_ISLINKABLE },
{ ID_GD, "GPencil", "grease_pencil",
IDTYPE_FLAGS_ISLINKABLE }, /* rename gpencil */
diff --git a/source/blender/editors/space_file/filelist.c
b/source/blender/editors/space_file/filelist.c
index 66acd7d..0c43819 100644
--- a/source/blender/editors/space_file/filelist.c
+++ b/source/blender/editors/space_file/filelist.c
@@ -1190,29 +1190,30 @@ static void filelist_from_main(struct FileList
*filelist)
filelist->filelist[0].relname = BLI_strdup(FILENAME_PARENT);
filelist->filelist[1].relname = BLI_strdup("Scene");
- filelist->filelist[2].relname = BLI_strdup("Object");
- filelist->filelist[3].relname = BLI_strdup("Mesh");
- filelist->filelist[4].relname = BLI_strdup("Curve");
- filelist->filelist[5].relname = BLI_strdup("Metaball");
- filelist->filelist[6].relname = BLI_strdup("Material");
- filelist->filelist[7].relname = BLI_strdup("Texture");
- filelist->filelist[8].relname = BLI_strdup("Image");
- filelist->filelist[9].relname = BLI_strdup("Ika");
- filelist->filelist[10].relname = BLI_strdup("Wave");
- filelist->filelist[11].relname = BLI_strdup("Lattice");
- filelist->filelist[12].relname = BLI_strdup("Lamp");
- filelist->filelist[13].relname = BLI_strdup("Camera");
- filelist->filelist[14].relname = BLI_strdup("Ipo");
- filelist->filelist[15].relname = BLI_strdup("World");
- filelist->filelist[16].relname = BLI_strdup("Screen");
- filelist->filelist[17].relname = BLI_strdup("VFont");
- filelist->filelist[18].relname = BLI_strdup("Text");
- filelist->filelist[19].relname = BLI_strdup("Armature");
- filelist->filelist[20].relname = BLI_strdup("Action");
- filelist->filelist[21].relname = BLI_strdup("NodeTree");
- filelist->filelist[22].relname = BLI_strdup("Speaker");
+ filelist->filelist[2].relname = BLI_strdup("CacheLibrary");
+ filelist->filelist[3].relname = BLI_strdup("Object");
+ filelist->filelist[4].relname = BLI_strdup("Mesh");
+ filelist->filelist[5].relname = BLI_strdup("Curve");
+ filelist->filelist[6].relname = BLI_strdup("Metaball");
+ filelist->filelist[7].relname = BLI_strdup("Material");
+ filelist->filelist[8].relname = BLI_strdup("Texture");
+ filelist->filelist[9].relname = BLI_strdup("Image");
+ filelist->filelist[10].relname = BLI_strdup("Ika");
+ filelist->filelist[11].relname = BLI_strdup("Wave");
+ filelist->filelist[12].relname = BLI_strdup("Lattice");
+ filelist->filelist[13].relname = BLI_strdup("Lamp");
+ filelist->filelist[14].relname = BLI_strdup("Camera");
+ filelist->filelist[15].relname = BLI_strdup("Ipo");
+ filelist->filelist[16].relname = BLI_strdup("World");
+ filelist->filelist[17].relname = BLI_strdup("Screen");
+ filelist->filelist[18].relname = BLI_strdup("VFont");
+ filelist->filelist[19].relname = BLI_strdup("Text");
+ filelist->filelist[20].relname = BLI_strdup("Armature");
+ filelist->filelist[21].relname = BLI_strdup("Action");
+ filelist->filelist[22].relname = BLI_strdup("NodeTree");
+ filelist->filelist[23].relname = BLI_strdup("Speaker");
#ifdef WITH_FREESTYLE
- filelist->filelist[23].relname =
BLI_strdup("FreestyleLineStyle");
+ filelist->filelist[24].relname =
BLI_strdup("FreestyleLineStyle");
#endif
}
else {
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
