[Bf-blender-cvs] [089835469a4] greasepencil-object: Fix error in default gp object after delete

Antonio Vazquez noreply at git.blender.org
Mon Oct 9 19:20:07 CEST 2017


Commit: 089835469a4e76ccd2e42fc96854cbaa456adfca
Author: Antonio Vazquez
Date:   Mon Oct 9 19:19:58 2017 +0200
Branches: greasepencil-object
https://developer.blender.org/rB089835469a4e76ccd2e42fc96854cbaa456adfca

Fix error in default gp object after delete

If delete the gp object and it is assigned as default scene gp object, must be cleared.

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

M	source/blender/editors/object/object_add.c

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

diff --git a/source/blender/editors/object/object_add.c b/source/blender/editors/object/object_add.c
index 758991d8788..f9496c084d0 100644
--- a/source/blender/editors/object/object_add.c
+++ b/source/blender/editors/object/object_add.c
@@ -1343,6 +1343,16 @@ static int object_delete_exec(bContext *C, wmOperator *op)
 			}
 		}
 
+		/* remove as scene default annotation object */
+		if (ob->type == OB_GPENCIL) {
+			Scene *scene_iter;
+			for (scene_iter = bmain->scene.first; scene_iter; scene_iter = scene_iter->id.next) {
+				if (scene->gp_object == ob) {
+					scene->gp_object = NULL;
+				}
+			}
+		}
+
 		/* remove from current scene only */
 		ED_base_object_free_and_unlink(bmain, scene, ob);
 		changed = true;



More information about the Bf-blender-cvs mailing list