[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [59018] branches/soc-2013-paint/source/ blender: Allow linking of palettes

[Antony Riakiotakis]

Revision: 59018
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=59018
Author:   psy-fi
Date:     2013-08-08 09:43:30 +0000 (Thu, 08 Aug 2013)
Log Message:
-----------
Allow linking of palettes

Modified Paths:
--------------
    branches/soc-2013-paint/source/blender/blenkernel/intern/idcode.c
    branches/soc-2013-paint/source/blender/blenloader/intern/readfile.c

Modified: branches/soc-2013-paint/source/blender/blenkernel/intern/idcode.c
===================================================================
--- branches/soc-2013-paint/source/blender/blenkernel/intern/idcode.c	2013-08-08 07:39:18 UTC (rev 59017)
+++ branches/soc-2013-paint/source/blender/blenkernel/intern/idcode.c	2013-08-08 09:43:30 UTC (rev 59018)
@@ -73,6 +73,7 @@
 	{ ID_NT,     "NodeTree",         "node_groups",     IDTYPE_FLAGS_ISLINKABLE },
 	{ ID_OB,     "Object",           "objects",         IDTYPE_FLAGS_ISLINKABLE },
 	{ ID_PA,     "ParticleSettings", "particles",       0                       },
+	{ ID_PAL,    "Palettes",         "palettes",        IDTYPE_FLAGS_ISLINKABLE },
 	{ ID_SCE,    "Scene",            "scenes",          IDTYPE_FLAGS_ISLINKABLE },
 	{ ID_SCR,    "Screen",           "screens",         0                       },
 	{ ID_SEQ,    "Sequence",         "sequences",       0                       }, /* not actually ID data */

Modified: branches/soc-2013-paint/source/blender/blenloader/intern/readfile.c
===================================================================
--- branches/soc-2013-paint/source/blender/blenloader/intern/readfile.c	2013-08-08 07:39:18 UTC (rev 59017)
+++ branches/soc-2013-paint/source/blender/blenloader/intern/readfile.c	2013-08-08 09:43:30 UTC (rev 59018)
@@ -1851,8 +1851,6 @@
 	for (palette = main->palettes.first; palette; palette = palette->id.next) {
 		if (palette->id.flag & LIB_NEED_LINK) {
 			palette->id.flag -= LIB_NEED_LINK;
-
-			if (palette->id.properties) IDP_LibLinkProperty(palette->id.properties, (fd->flags & FD_FLAGS_SWITCH_ENDIAN), fd);
 		}
 	}
 }
@@ -7054,6 +7052,7 @@
 		case ID_NT: return "Data from NT";
 		case ID_BR: return "Data from BR";
 		case ID_PA: return "Data from PA";
+		case ID_PAL: return "Data from PAL";
 		case ID_GD: return "Data from GD";
 		case ID_MC: return "Data from MC";
 		case ID_LS: return "Data from LS";