Commit: 0d668cdf79225802aa3384fddb23a17921831f12
Author: Antonio Vazquez
Date: Wed Apr 5 17:39:22 2017 +0200
Branches: greasepencil-object
https://developer.blender.org/rB0d668cdf79225802aa3384fddb23a17921831f12
Merge branch 'blender2.8' into greasepencil-object
===================================================================
===================================================================
diff --cc source/blender/blenkernel/BKE_context.h
index 8fd19c0601f,22368104566..dda84e9322f
--- a/source/blender/blenkernel/BKE_context.h
+++ b/source/blender/blenkernel/BKE_context.h
@@@ -301,12 -304,8 +302,14 @@@ int CTX_data_visible_gpencil_layers(con
int CTX_data_editable_gpencil_layers(const bContext *C, ListBase *list);
int CTX_data_editable_gpencil_strokes(const bContext *C, ListBase *list);
+struct Palette *CTX_data_active_palette(const bContext *C);
+struct PaletteColor *CTX_data_active_palettecolor(const bContext *C);
+int CTX_data_active_palettecolors(const bContext *C, ListBase *list);
+int CTX_data_available_palettes(const bContext *C, ListBase *list);
+int CTX_data_available_palettecolors(const bContext *C, ListBase *list);
+
+ struct Depsgraph *CTX_data_depsgraph(const bContext *C);
+
#ifdef __cplusplus
}
#endif
diff --cc source/blender/blenkernel/intern/context.c
index 0c6565e89cd,20a3d4ac7e0..a94ff47ef44
--- a/source/blender/blenkernel/intern/context.c
+++ b/source/blender/blenkernel/intern/context.c
@@@ -1209,27 -1211,8 +1211,33 @@@ int CTX_data_editable_gpencil_strokes(c
return ctx_data_collection_get(C, "editable_gpencil_strokes", list);
}
+Palette *CTX_data_active_palette(const bContext *C)
+{
+ return ctx_data_pointer_get(C, "active_palette");
+}
+
+PaletteColor *CTX_data_active_palettecolor(const bContext *C)
+{
+ return ctx_data_pointer_get(C, "active_palettecolor");
+}
+
+int CTX_data_available_palettes(const bContext *C, ListBase *list)
+{
+ return ctx_data_collection_get(C, "available_palettes", list);
+}
+
+int CTX_data_active_palettecolorss(const bContext *C, ListBase *list)
+{
+ return ctx_data_collection_get(C, "active_palettecolors", list);
+}
+
+int CTX_data_available_palettecolors(const bContext *C, ListBase *list)
+{
+ return ctx_data_collection_get(C, "available_palettecolors", list);
+}
++
+ Depsgraph *CTX_data_depsgraph(const bContext *C)
+ {
+ Scene *scene = CTX_data_scene(C);
+ return scene->depsgraph;
+ }
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
