[Bf-blender-cvs] [8a28f6e08db] greasepencil-refactor: Merge branch 'greasepencil-object' into greasepencil-refactor

[Antonio Vazquez]

Commit: 8a28f6e08db6a73eba18200baf735d148c21712a
Author: Antonio Vazquez
Date:   Tue Jan 7 11:38:39 2020 +0100
Branches: greasepencil-refactor
https://developer.blender.org/rB8a28f6e08db6a73eba18200baf735d148c21712a

Merge branch 'greasepencil-object' into greasepencil-refactor

 Conflicts:
	source/blender/editors/gpencil/gpencil_data.c
	source/blender/editors/gpencil/gpencil_edit.c
	source/blender/editors/gpencil/gpencil_utils.c

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



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

diff --cc source/blender/editors/screen/screen_context.c
index f3512d746f9,a840d199823..134a51751f9
--- a/source/blender/editors/screen/screen_context.c
+++ b/source/blender/editors/screen/screen_context.c
@@@ -530,11 -552,22 +552,22 @@@ int ed_screen_context(const bContext *C
      }
    }
    else if (CTX_data_equals(member, "active_gpencil_layer")) {
-     /* XXX: see comment for gpencil_data case... */
-     bGPdata *gpd = ED_gpencil_data_get_active_direct((ID *)sc, sa, scene, obact);
+     bGPdata *gpd = ED_gpencil_data_get_active_direct(sa, obact);
+ 
+     if (gpd) {
+       bGPDlayer *gpl = BKE_gpencil_layer_getactive(gpd);
+ 
+       if (gpl) {
+         CTX_data_pointer_set(result, &gpd->id, &RNA_GPencilLayer, gpl);
+         return 1;
+       }
+     }
+   }
+   else if (CTX_data_equals(member, "active_annotation_layer")) {
+     bGPdata *gpd = ED_annotation_data_get_active_direct((ID *)sc, sa, scene);
  
      if (gpd) {
 -      bGPDlayer *gpl = BKE_gpencil_layer_getactive(gpd);
 +      bGPDlayer *gpl = BKE_gpencil_layer_active_get(gpd);
  
        if (gpl) {
          CTX_data_pointer_set(result, &gpd->id, &RNA_GPencilLayer, gpl);
@@@ -543,11 -576,10 +576,10 @@@
      }
    }
    else if (CTX_data_equals(member, "active_gpencil_frame")) {
-     /* XXX: see comment for gpencil_data case... */
-     bGPdata *gpd = ED_gpencil_data_get_active_direct((ID *)sc, sa, scene, obact);
+     bGPdata *gpd = ED_gpencil_data_get_active_direct(sa, obact);
  
      if (gpd) {
 -      bGPDlayer *gpl = BKE_gpencil_layer_getactive(gpd);
 +      bGPDlayer *gpl = BKE_gpencil_layer_active_get(gpd);
  
        if (gpl) {
          CTX_data_pointer_set(result, &gpd->id, &RNA_GPencilLayer, gpl->actframe);