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

[Antonio Vazquez]

Commit: 2801dbffe3b009bf0c798285db51c43f6796a041
Author: Antonio Vazquez
Date:   Mon Sep 11 16:43:15 2017 +0200
Branches: greasepencil-object
https://developer.blender.org/rB2801dbffe3b009bf0c798285db51c43f6796a041

Merge branch 'blender2.8' into greasepencil-object

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



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

diff --cc source/blender/makesrna/intern/rna_gpencil.c
index efa4cd47d0e,79e1e95b27a..307b64c3024
--- a/source/blender/makesrna/intern/rna_gpencil.c
+++ b/source/blender/makesrna/intern/rna_gpencil.c
@@@ -89,14 -70,11 +89,14 @@@ static void rna_GPencil_update(Main *UN
  	WM_main_add_notifier(NC_GPENCIL | NA_EDITED, NULL);
  }
  
 -static void rna_GPencil_editmode_update(Main *UNUSED(bmain), Scene *UNUSED(scene), PointerRNA *UNUSED(ptr))
 +static void rna_GPencil_editmode_update(Main *UNUSED(bmain), Scene *UNUSED(scene), PointerRNA *ptr)
  {
 +	bGPdata *gpd = (bGPdata *)ptr->id.data;
 +	BKE_gpencil_batch_cache_dirty(gpd);
 +
  	/* Notify all places where GPencil data lives that the editing state is different */
  	WM_main_add_notifier(NC_GPENCIL | NA_EDITED, NULL);
- 	WM_main_add_notifier(NC_SCENE | ND_MODE, NULL);
+ 	WM_main_add_notifier(NC_SCENE | ND_MODE | NC_MOVIECLIP, NULL);
  }
  
  static void rna_GPencil_onion_skinning_update(Main *bmain, Scene *scene, PointerRNA *ptr)