[Bf-blender-cvs] [286d4e77a70] greasepencil-object: Fix error with copy-on-write

[Antonio Vazquez]

Commit: 286d4e77a70ebda64a0d15b4773c167049629879
Author: Antonio Vazquez
Date:   Tue Mar 20 18:59:59 2018 +0100
Branches: greasepencil-object
https://developer.blender.org/rB286d4e77a70ebda64a0d15b4773c167049629879

Fix error with copy-on-write

Verify tag of cow before remove temp objects.

===================================================================

M	source/blender/draw/engines/gpencil/gpencil_engine.c

===================================================================

diff --git a/source/blender/draw/engines/gpencil/gpencil_engine.c b/source/blender/draw/engines/gpencil/gpencil_engine.c
index 6505e9c9607..6d9b94efb8c 100644
--- a/source/blender/draw/engines/gpencil/gpencil_engine.c
+++ b/source/blender/draw/engines/gpencil/gpencil_engine.c
@@ -685,7 +685,9 @@ static void gpencil_free_obj_list(GPENCIL_StorageList *stl)
 	/* clear temp objects created for display only */
 	for (int i = 0; i < stl->g_data->gp_cache_used; i++) {
 		Object *ob = stl->g_data->gp_object_cache[i].ob;
-		if (ob->id.tag & LIB_TAG_NO_MAIN) {
+		if (((ob->id.tag & LIB_TAG_COPY_ON_WRITE) == 0) &&
+			(ob->id.tag & LIB_TAG_NO_MAIN))
+		{
 			MEM_SAFE_FREE(ob);
 		}
 	}