Commit: 5af85d904e5bbdd9e235c3007583f6513f3996d4
Author: Campbell Barton
Date: Fri Mar 8 09:55:40 2019 +1100
Branches: master
https://developer.blender.org/rB5af85d904e5bbdd9e235c3007583f6513f3996d4
RNA: rename bpy.data.grease_pencil to grease_pencils
All other sequences are plural here.
===================================================================
M release/scripts/startup/bl_ui/space_dopesheet.py
M source/blender/blenkernel/intern/idcode.c
M source/blender/makesrna/intern/rna_main.c
===================================================================
diff --git a/release/scripts/startup/bl_ui/space_dopesheet.py
b/release/scripts/startup/bl_ui/space_dopesheet.py
index e474637dc87..4816bb6361d 100644
--- a/release/scripts/startup/bl_ui/space_dopesheet.py
+++ b/release/scripts/startup/bl_ui/space_dopesheet.py
@@ -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")
diff --git a/source/blender/blenkernel/intern/idcode.c
b/source/blender/blenkernel/intern/idcode.c
index 1c63f184bde..df8de1aa2cf 100644
--- a/source/blender/blenkernel/intern/idcode.c
+++ b/source/blender/blenkernel/intern/idcode.c
@@ -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 },
diff --git a/source/blender/makesrna/intern/rna_main.c
b/source/blender/makesrna/intern/rna_main.c
index 7bc0db3a725..f4c6eeff4c5 100644
--- a/source/blender/makesrna/intern/rna_main.c
+++ b/source/blender/makesrna/intern/rna_main.c
@@ -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},
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
