[Bf-blender-cvs] [99420e96a8b] greasepencil-object: Merge branch 'blender2.8' into greasepencil-object

[Antonio Vazquez]

Commit: 99420e96a8bb133a202cbe32d66a003d580e79c8
Author: Antonio Vazquez
Date:   Fri Sep 1 09:59:17 2017 +0200
Branches: greasepencil-object
https://developer.blender.org/rB99420e96a8bb133a202cbe32d66a003d580e79c8

Merge branch 'blender2.8' into greasepencil-object

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



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

diff --cc source/blender/editors/screen/screen_context.c
index 737cc698aab,5f9a54a4654..04c3c90181f
--- a/source/blender/editors/screen/screen_context.c
+++ b/source/blender/editors/screen/screen_context.c
@@@ -79,8 -79,7 +80,8 @@@ const char *screen_context_dir[] = 
  	"visible_gpencil_layers", "editable_gpencil_layers", "editable_gpencil_strokes",
  	"active_gpencil_layer", "active_gpencil_frame", "active_gpencil_palette", 
  	"active_gpencil_palettecolor", "active_gpencil_brush",
 +	"active_palette", "active_palettecolor", "available_palettes", "available_palettecolors",
- 	"active_operator",
+ 	"active_operator", "selected_editable_fcurves",
  	NULL};
  
  int ed_screen_context(const bContext *C, const char *member, bContextDataResult *result)