Merging r40653 through r40847 from trunk into soc-2011-tomato
[blender.git] / source / blender / makesdna / DNA_ID.h
index 39985a7ac735fe9d022af51402da2647483a9290..44b517a16a10540a44670a764880b3ef475178eb 100644 (file)
@@ -125,7 +125,7 @@ typedef struct Library {
 
 enum eIconSizes {
        ICON_SIZE_ICON,
 
 enum eIconSizes {
        ICON_SIZE_ICON,
-       ICON_SIZE_PREVIEW,
+       ICON_SIZE_PREVIEW
 };
 #define NUM_ICON_SIZES (ICON_SIZE_PREVIEW + 1)
 
 };
 #define NUM_ICON_SIZES (ICON_SIZE_PREVIEW + 1)
 
@@ -205,6 +205,8 @@ typedef struct PreviewImage {
 
 #define ID_REAL_USERS(id) (((ID *)id)->us - ((((ID *)id)->flag & LIB_FAKEUSER) ? 1:0))
 
 
 #define ID_REAL_USERS(id) (((ID *)id)->us - ((((ID *)id)->flag & LIB_FAKEUSER) ? 1:0))
 
+#define ID_CHECK_UNDO(id) ((GS((id)->name) != ID_SCR) && (GS((id)->name) != ID_WM))
+
 #ifdef GS
 #undef GS
 #endif
 #ifdef GS
 #undef GS
 #endif