[Bf-blender-cvs] [728197c] wiggly-widgets: Merge branch 'master' into wiggly-widgets

[Julian Eisel]

Commit: 728197c9fba40eac69926e897553cffc044fb43d
Author: Julian Eisel
Date:   Tue Aug 18 00:04:55 2015 +0200
Branches: wiggly-widgets
https://developer.blender.org/rB728197c9fba40eac69926e897553cffc044fb43d

Merge branch 'master' into wiggly-widgets

===================================================================



===================================================================

diff --cc source/blender/editors/space_graph/graph_buttons.c
index 2782bdb,8e471ce..02a4431
--- a/source/blender/editors/space_graph/graph_buttons.c
+++ b/source/blender/editors/space_graph/graph_buttons.c
@@@ -951,8 -929,9 +951,8 @@@ void graph_buttons_register(ARegionTyp
  	pt = MEM_callocN(sizeof(PanelType), "spacetype graph panel view");
  	strcpy(pt->idname, "GRAPH_PT_view");
  	strcpy(pt->label, N_("View Properties"));
- 	strcpy(pt->translation_context, BLF_I18NCONTEXT_DEFAULT_BPYRNA);
+ 	strcpy(pt->translation_context, BLT_I18NCONTEXT_DEFAULT_BPYRNA);
  	pt->draw = graph_panel_view;
 -	pt->flag |= PNL_DEFAULT_CLOSED;
  	BLI_addtail(&art->paneltypes, pt);
  	
  	pt = MEM_callocN(sizeof(PanelType), "spacetype graph panel properties");