Commit: b809b02ea58be6bccc6331b52ddb40f68aaf20bc Author: Julian Eisel Date: Thu Jan 5 00:36:31 2017 +0100 Branches: workspaces https://developer.blender.org/rBb809b02ea58be6bccc6331b52ddb40f68aaf20bc
Merge branch 'blender2.8' into workspaces =================================================================== =================================================================== diff --cc source/blender/makesdna/DNA_ID.h index 89f78ac,2c6f3d2..971b60d --- a/source/blender/makesdna/DNA_ID.h +++ b/source/blender/makesdna/DNA_ID.h @@@ -278,8 -277,9 +278,9 @@@ typedef enum ID_Type #define ID_FAKE_USERS(id) ((((ID *)id)->flag & LIB_FAKEUSER) ? 1 : 0) #define ID_REAL_USERS(id) (((ID *)id)->us - ID_FAKE_USERS(id)) + #define ID_EXTRA_USERS(id) (((ID *)id)->tag & LIB_TAG_EXTRAUSER ? 1 : 0) -#define ID_CHECK_UNDO(id) ((GS((id)->name) != ID_SCR) && (GS((id)->name) != ID_WM)) +#define ID_CHECK_UNDO(id) ((GS((id)->name) != ID_SCR) && (GS((id)->name) != ID_WM) && (GS((id)->name) != ID_WS)) #define ID_BLEND_PATH(_bmain, _id) ((_id)->lib ? (_id)->lib->filepath : (_bmain)->name) _______________________________________________ Bf-blender-cvs mailing list [email protected] https://lists.blender.org/mailman/listinfo/bf-blender-cvs
