diff options
author | Julian Eisel <eiseljulian@gmail.com> | 2016-08-04 16:03:18 +0300 |
---|---|---|
committer | Julian Eisel <eiseljulian@gmail.com> | 2016-08-04 16:11:21 +0300 |
commit | 357480f8c3710cdd6331c86a8ee0f28bfaf4f507 (patch) | |
tree | 37968285c7ffc565dfb4d30158bd3a1306cbfdee /source/blender/editors/screen | |
parent | 5f63797c0985c9be8e0bf57fcc9aa1893a896af7 (diff) |
Cleanup: Use BKE_gpencil prefix
This is a good point to change this as grease-pencil-v2 branch was just merged, so I hope merge conflicts with other branches are minimal.
Diffstat (limited to 'source/blender/editors/screen')
-rw-r--r-- | source/blender/editors/screen/screen_context.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/source/blender/editors/screen/screen_context.c b/source/blender/editors/screen/screen_context.c index 5da4a77cfd5..34c51914027 100644 --- a/source/blender/editors/screen/screen_context.c +++ b/source/blender/editors/screen/screen_context.c @@ -467,7 +467,7 @@ int ed_screen_context(const bContext *C, const char *member, bContextDataResult bGPdata *gpd = ED_gpencil_data_get_active_direct((ID *)sc, scene, sa, obact); if (gpd) { - bGPDlayer *gpl = gpencil_layer_getactive(gpd); + bGPDlayer *gpl = BKE_gpencil_layer_getactive(gpd); if (gpl) { CTX_data_pointer_set(result, &gpd->id, &RNA_GPencilLayer, gpl); @@ -480,7 +480,7 @@ int ed_screen_context(const bContext *C, const char *member, bContextDataResult bGPdata *gpd = ED_gpencil_data_get_active_direct((ID *)sc, scene, sa, obact); if (gpd) { - bGPDpalette *palette = gpencil_palette_getactive(gpd); + bGPDpalette *palette = BKE_gpencil_palette_getactive(gpd); if (palette) { CTX_data_pointer_set(result, &gpd->id, &RNA_GPencilPalette, palette); @@ -493,10 +493,10 @@ int ed_screen_context(const bContext *C, const char *member, bContextDataResult bGPdata *gpd = ED_gpencil_data_get_active_direct((ID *)sc, scene, sa, obact); if (gpd) { - bGPDpalette *palette = gpencil_palette_getactive(gpd); + bGPDpalette *palette = BKE_gpencil_palette_getactive(gpd); if (palette) { - bGPDpalettecolor *palcolor = gpencil_palettecolor_getactive(palette); + bGPDpalettecolor *palcolor = BKE_gpencil_palettecolor_getactive(palette); if (palcolor) { CTX_data_pointer_set(result, &gpd->id, &RNA_GPencilPaletteColor, palcolor); return 1; @@ -506,7 +506,7 @@ int ed_screen_context(const bContext *C, const char *member, bContextDataResult } else if (CTX_data_equals(member, "active_gpencil_brush")) { /* XXX: see comment for gpencil_data case... */ - bGPDbrush *brush = gpencil_brush_getactive(scene->toolsettings); + bGPDbrush *brush = BKE_gpencil_brush_getactive(scene->toolsettings); if (brush) { CTX_data_pointer_set(result, NULL, &RNA_GPencilBrush, brush); @@ -518,7 +518,7 @@ int ed_screen_context(const bContext *C, const char *member, bContextDataResult bGPdata *gpd = ED_gpencil_data_get_active_direct((ID *)sc, scene, sa, obact); if (gpd) { - bGPDlayer *gpl = gpencil_layer_getactive(gpd); + bGPDlayer *gpl = BKE_gpencil_layer_getactive(gpd); if (gpl) { CTX_data_pointer_set(result, &gpd->id, &RNA_GPencilLayer, gpl->actframe); |