Commit: 24b8e781f6de88d0ad5c49771cfe2d9f6ba08d84
Author: Julian Eisel
Date: Tue Jul 26 20:15:00 2016 +0200
Branches: master
https://developer.blender.org/rB24b8e781f6de88d0ad5c49771cfe2d9f6ba08d84
Correct UI names of ID types
Also correct typo.
===================================================================
M source/blender/editors/interface/interface_regions.c
M source/blender/makesrna/intern/rna_ID.c
===================================================================
diff --git a/source/blender/editors/interface/interface_regions.c
b/source/blender/editors/interface/interface_regions.c
index 48618a2..ed6e6fa 100644
--- a/source/blender/editors/interface/interface_regions.c
+++ b/source/blender/editors/interface/interface_regions.c
@@ -3341,7 +3341,7 @@ void UI_popup_block_close(bContext *C, wmWindow *win,
uiBlock *block)
UI_popup_handlers_remove(&win->modalhandlers,
block->handle);
ui_popup_block_free(C, block->handle);
- /* In the case we have nested popups, closing one may
need to redraw anorher, see: T48874 */
+ /* In the case we have nested popups, closing one may
need to redraw another, see: T48874 */
for (ARegion *ar = win->screen->regionbase.first; ar;
ar = ar->next) {
ED_region_tag_refresh_ui(ar);
}
diff --git a/source/blender/makesrna/intern/rna_ID.c
b/source/blender/makesrna/intern/rna_ID.c
index b6e9844..8ad6713 100644
--- a/source/blender/makesrna/intern/rna_ID.c
+++ b/source/blender/makesrna/intern/rna_ID.c
@@ -64,10 +64,10 @@ EnumPropertyItem rna_enum_id_type_items[] = {
{ID_LT, "LATTICE", ICON_LATTICE_DATA, "Lattice", ""},
{ID_MSK, "MASK", ICON_MOD_MASK, "Mask", ""},
{ID_MA, "MATERIAL", ICON_MATERIAL_DATA, "Material", ""},
- {ID_MB, "META", ICON_META_DATA, "MetaBall", ""},
+ {ID_MB, "META", ICON_META_DATA, "Metaball", ""},
{ID_ME, "MESH", ICON_MESH_DATA, "Mesh", ""},
- {ID_MC, "MOVIECLIP", ICON_CLIP, "MovieClip", ""},
- {ID_NT, "NODETREE", ICON_NODETREE, "NodeTree", ""},
+ {ID_MC, "MOVIECLIP", ICON_CLIP, "Movie Clip", ""},
+ {ID_NT, "NODETREE", ICON_NODETREE, "Node Tree", ""},
{ID_OB, "OBJECT", ICON_OBJECT_DATA, "Object", ""},
{ID_PC, "PAINTCURVE", ICON_CURVE_BEZCURVE, "Paint Curve", ""},
{ID_PAL, "PALETTE", ICON_COLOR, "Palette", ""},
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
