RNA: rename bpy.data.grease_pencil to grease_pencils
authorCampbell Barton <ideasman42@gmail.com>
Thu, 7 Mar 2019 22:55:40 +0000 (09:55 +1100)
committerCampbell Barton <ideasman42@gmail.com>
Thu, 7 Mar 2019 22:55:40 +0000 (09:55 +1100)
All other sequences are plural here.

release/scripts/startup/bl_ui/space_dopesheet.py
source/blender/blenkernel/intern/idcode.c
source/blender/makesrna/intern/rna_main.c

index e474637dc870fbdfecb5749c50a0e6758bcba1a4..4816bb6361d5dd2c1f142401fd7dc6edb0c25ca4 100644 (file)
@@ -121,7 +121,7 @@ class DopesheetFilterPopoverBase:
             flow.prop(dopesheet, "show_armatures", text="Armatures")
         if bpy.data.cameras:
             flow.prop(dopesheet, "show_cameras", text="Cameras")
-        if bpy.data.grease_pencil:
+        if bpy.data.grease_pencils:
             flow.prop(dopesheet, "show_gpencil", text="Grease Pencil Objects")
         if bpy.data.lights:
             flow.prop(dopesheet, "show_lights", text="Lights")
index 1c63f184bded5b7a360e1eee33d0812f5f1238b5..df8de1aa2cfe0ca84a29ed2154ede5dc8720a199 100644 (file)
@@ -55,7 +55,8 @@ static IDType idtypes[] = {
        {ID_CF,   "CacheFile",          "cache_files",     BLT_I18NCONTEXT_ID_CACHEFILE,          IDTYPE_FLAGS_ISLINKABLE},
        {ID_GR,   "Collection",         "collections",     BLT_I18NCONTEXT_ID_COLLECTION,         IDTYPE_FLAGS_ISLINKABLE},
        {ID_CU,   "Curve",              "curves",          BLT_I18NCONTEXT_ID_CURVE,              IDTYPE_FLAGS_ISLINKABLE},
-       {ID_GD,   "GPencil",            "grease_pencil",   BLT_I18NCONTEXT_ID_GPENCIL,            IDTYPE_FLAGS_ISLINKABLE}, /* rename gpencil */
+       {ID_GD,   "GPencil",            "grease_pencils",  BLT_I18NCONTEXT_ID_GPENCIL,            IDTYPE_FLAGS_ISLINKABLE}, /* rename gpencil */
+
        {ID_IM,   "Image",              "images",          BLT_I18NCONTEXT_ID_IMAGE,              IDTYPE_FLAGS_ISLINKABLE},
        {ID_IP,   "Ipo",                "ipos",            "",                                    IDTYPE_FLAGS_ISLINKABLE}, /* deprecated */
        {ID_KE,   "Key",                "shape_keys",      BLT_I18NCONTEXT_ID_SHAPEKEY,           0                      },
index 7bc0db3a725bd33fb1b861321b94b504546b697d..f4c6eeff4c57114b3dbe209ae47bb01872093845 100644 (file)
@@ -369,7 +369,7 @@ void RNA_def_main(BlenderRNA *brna)
                {"actions", "Action", "rna_Main_actions_begin", "Actions", "Action data-blocks", RNA_def_main_actions},
                {"particles", "ParticleSettings", "rna_Main_particles_begin", "Particles", "Particle data-blocks", RNA_def_main_particles},
                {"palettes", "Palette", "rna_Main_palettes_begin", "Palettes", "Palette data-blocks", RNA_def_main_palettes},
-               {"grease_pencil", "GreasePencil", "rna_Main_gpencils_begin", "Grease Pencil", "Grease Pencil data-blocks", RNA_def_main_gpencil},
+               {"grease_pencils", "GreasePencil", "rna_Main_gpencils_begin", "Grease Pencil", "Grease Pencil data-blocks", RNA_def_main_gpencil},
                {"movieclips", "MovieClip", "rna_Main_movieclips_begin", "Movie Clips", "Movie Clip data-blocks", RNA_def_main_movieclips},
                {"masks", "Mask", "rna_Main_masks_begin", "Masks", "Masks data-blocks", RNA_def_main_masks},
                {"linestyles", "FreestyleLineStyle", "rna_Main_linestyles_begin", "Line Styles", "Line Style data-blocks", RNA_def_main_linestyles},