diff options
| author | Joshua Leung <aligorith@gmail.com> | 2009-09-03 09:12:34 +0400 |
|---|---|---|
| committer | Joshua Leung <aligorith@gmail.com> | 2009-09-03 09:12:34 +0400 |
| commit | 8d407b7b28242fbccb6f314f02056bcab753a67a (patch) | |
| tree | 5e41b14ba39b5adee7aae418df5c5c71b1c2dffb /source/blender/makesrna | |
| parent | 6239d18d50911959a8d5a40056ef87e7253cc70e (diff) | |
Grease Pencil: Datablock bugfixes
* Grease Pencil datablocks can now be properly browsed/added/unlinked from the UI panels
* Made Grease Pencil use the brush icon for now. A proper icon for this would be nice ;)
Diffstat (limited to 'source/blender/makesrna')
| -rw-r--r-- | source/blender/makesrna/intern/rna_ID.c | 1 | ||||
| -rw-r--r-- | source/blender/makesrna/intern/rna_gpencil.c | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/makesrna/intern/rna_ID.c b/source/blender/makesrna/intern/rna_ID.c index dd26391b11e..f5c6063e892 100644 --- a/source/blender/makesrna/intern/rna_ID.c +++ b/source/blender/makesrna/intern/rna_ID.c @@ -65,6 +65,7 @@ short RNA_type_to_ID_code(StructRNA *type) if(RNA_struct_is_a(type, &RNA_Brush)) return ID_BR; if(RNA_struct_is_a(type, &RNA_Camera)) return ID_CA; if(RNA_struct_is_a(type, &RNA_Curve)) return ID_CU; + if(RNA_struct_is_a(type, &RNA_GreasePencil)) return ID_GD; if(RNA_struct_is_a(type, &RNA_Group)) return ID_GR; if(RNA_struct_is_a(type, &RNA_Image)) return ID_IM; if(RNA_struct_is_a(type, &RNA_Key)) return ID_KE; diff --git a/source/blender/makesrna/intern/rna_gpencil.c b/source/blender/makesrna/intern/rna_gpencil.c index df0e5ae6703..5caa868fd2e 100644 --- a/source/blender/makesrna/intern/rna_gpencil.c +++ b/source/blender/makesrna/intern/rna_gpencil.c @@ -223,7 +223,7 @@ void rna_def_gpencil_data(BlenderRNA *brna) srna= RNA_def_struct(brna, "GreasePencil", "ID"); RNA_def_struct_sdna(srna, "bGPdata"); RNA_def_struct_ui_text(srna, "Grease Pencil", "Freehand annotation sketchbook."); - //RNA_def_struct_ui_icon(srna, ICON_GPENCIL); + RNA_def_struct_ui_icon(srna, ICON_BRUSH_DATA); // XXX: ICON_GPENCIL!!! /* Layers */ prop= RNA_def_property(srna, "layers", PROP_COLLECTION, PROP_NONE); |