[Bf-blender-cvs] [8d9c0cf4f] hair_immediate_fixes: Merge branch 'gooseberry' into hair_immediate_fixes

[Lukas Tönne]

Commit: 8d9c0cf4faf407d78abc9a02693859c5a8c8dd6d
Author: Lukas Tönne
Date:   Fri Dec 5 10:08:14 2014 +0100
Branches: hair_immediate_fixes
https://developer.blender.org/rB8d9c0cf4faf407d78abc9a02693859c5a8c8dd6d

Merge branch 'gooseberry' into hair_immediate_fixes

Conflicts:
	source/blender/makesdna/DNA_brush_types.h

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



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

diff --cc source/blender/editors/screen/screen_context.c
index f45ecd7,ce9c608..25146bf
--- a/source/blender/editors/screen/screen_context.c
+++ b/source/blender/editors/screen/screen_context.c
@@@ -64,8 -67,11 +67,11 @@@ const char *screen_context_dir[] = 
  	"visible_pose_bones", "selected_pose_bones", "active_bone", "active_pose_bone",
  	"active_base", "active_object", "object", "edit_object",
  	"sculpt_object", "vertex_paint_object", "weight_paint_object",
 -	"image_paint_object", "particle_edit_object",
 +	"image_paint_object", "particle_edit_object", "hair_edit_object",
  	"sequences", "selected_sequences", "selected_editable_sequences", /* sequencer */
+ 	"gpencil_data", "gpencil_data_owner", /* grease pencil data */
+ 	"visible_gpencil_layers", "editable_gpencil_layers", "editable_gpencil_strokes",
+ 	"active_gpencil_layer", "active_gpencil_frame",
  	"active_operator",
  	NULL};
  
diff --cc source/blender/makesdna/DNA_brush_types.h
index 23dd8e7,2fce2be..1349408
--- a/source/blender/makesdna/DNA_brush_types.h
+++ b/source/blender/makesdna/DNA_brush_types.h
@@@ -101,9 -102,7 +101,9 @@@ typedef struct Brush 
  	char vertexpaint_tool;  /* active vertex/weight paint blend mode (poorly named) */
  	char imagepaint_tool;   /* active image paint tool */
  	char mask_tool;         /* enum BrushMaskTool, only used if sculpt_tool is SCULPT_TOOL_MASK */
 +	char hair_tool;         /* active hair tool */
 +	char pad2[3];
- 
+ 	
  	float autosmooth_factor;
  
  	float crease_pinch_factor;