svn merge ^/trunk/blender -r47603:47611
[blender.git] / source / blender / makesrna / intern / rna_space.c
index 082c7c406e2c1eacb60d87547871928a6b25cc50..6755f7b7e78e2922f10bd261a733582f3b9c89fa 100644 (file)
@@ -3002,6 +3002,12 @@ static void rna_def_space_clip(BlenderRNA *brna)
                {0, NULL, 0, NULL, NULL}
        };
 
+       static EnumPropertyItem gpencil_source_items[] = {
+               {SC_GPENCIL_SRC_CLIP, "CLIP", 0, "Clip", "Show grease pencil datablock which belongs to movie clip"},
+               {SC_GPENCIL_SRC_TRACK, "TRACK", 0, "Track", "Show grease pencil datablock which belongs to active track"},
+               {0, NULL, 0, NULL, NULL}
+       };
+
        static EnumPropertyItem pivot_items[] = {
                {V3D_CENTER, "BOUNDING_BOX_CENTER", ICON_ROTATE, "Bounding Box Center",
                             "Pivot around bounding box center of selected object(s)"},
@@ -3211,6 +3217,13 @@ static void rna_def_space_clip(BlenderRNA *brna)
        RNA_def_property_ui_text(prop, "Show Seconds", "Show timing in seconds not frames");
        RNA_def_property_update(prop, NC_MOVIECLIP | ND_DISPLAY, NULL);
 
+       /* grease pencil source */
+       prop = RNA_def_property(srna, "grease_pencil_source", PROP_ENUM, PROP_NONE);
+       RNA_def_property_enum_sdna(prop, NULL, "gpencil_src");
+       RNA_def_property_enum_items(prop, gpencil_source_items);
+       RNA_def_property_ui_text(prop, "Grease Pencil Source", "Where the grease pencil comes from");
+       RNA_def_property_update(prop, NC_MOVIECLIP | ND_DISPLAY, NULL);
+
        /* pivot point */
        prop = RNA_def_property(srna, "pivot_point", PROP_ENUM, PROP_NONE);
        RNA_def_property_enum_sdna(prop, NULL, "around");