Commit: e944835aa5e6bd4002465e8d05de21450e769b30
Author: Antonioya
Date:   Mon Apr 8 11:28:53 2019 +0200
Branches: master
https://developer.blender.org/rBe944835aa5e6bd4002465e8d05de21450e769b30

GPencil: Cleanup unused code

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

M       source/blender/editors/gpencil/gpencil_old.c

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

diff --git a/source/blender/editors/gpencil/gpencil_old.c 
b/source/blender/editors/gpencil/gpencil_old.c
index 47654b69da4..a5f552e411b 100644
--- a/source/blender/editors/gpencil/gpencil_old.c
+++ b/source/blender/editors/gpencil/gpencil_old.c
@@ -161,36 +161,6 @@ static int gpencil_convert_old_files_exec(bContext *C, 
wmOperator *UNUSED(op))
                scene->gpd = NULL;
        }
 
-#if 0 /* GPXX */
-       /* Handle object-linked grease pencil datablocks */
-       for (Object *ob = bmain->objects.first; ob; ob = ob->id.next) {
-               if (ob->gpd) {
-                       if (ob->type == OB_GPENCIL) {
-                               /* GP Object - remap the links */
-                               ob->data = ob->gpd;
-                               ob->gpd = NULL;
-                       }
-                       else if (ob->type == OB_EMPTY) {
-                               /* Empty with GP data - This should be able to 
be converted
-                                * to a GP object with little data loss
-                                */
-                               ob->data = ob->gpd;
-                               ob->gpd = NULL;
-                               ob->type = OB_GPENCIL;
-                       }
-                       else {
-                               /* FIXME: What to do in this case?
-                                *
-                                * We cannot create new objects for these, as 
we don't have a scene & scene layer
-                                * to put them into from here...
-                                */
-                               printf("WARNING: Old Grease Pencil data ('%s') 
still exists on Object '%s'\n",
-                                      ob->gpd->id.name + 2, ob->id.name + 2);
-                       }
-               }
-       }
-#endif
-
        /* notifiers */
        WM_event_add_notifier(C, NC_GPENCIL | ND_DATA | NA_EDITED, NULL);

_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs

Reply via email to