[Bf-blender-cvs] [00591fc2a72] greasepencil-object: Cleanup: Removing stuff that was added earlier but is no longer needed

Joshua Leung noreply at git.blender.org
Wed May 9 16:37:53 CEST 2018


Commit: 00591fc2a7272f2a2c9808154513a7562c9a8d5c
Author: Joshua Leung
Date:   Wed May 9 15:47:09 2018 +0200
Branches: greasepencil-object
https://developer.blender.org/rB00591fc2a7272f2a2c9808154513a7562c9a8d5c

Cleanup: Removing stuff that was added earlier but is no longer needed

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

M	source/blender/blenkernel/BKE_context.h
M	source/blender/blenkernel/intern/context.c
M	source/blender/editors/screen/screen_context.c

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

diff --git a/source/blender/blenkernel/BKE_context.h b/source/blender/blenkernel/BKE_context.h
index 18b83be462c..fc415c6fa37 100644
--- a/source/blender/blenkernel/BKE_context.h
+++ b/source/blender/blenkernel/BKE_context.h
@@ -311,19 +311,11 @@ int CTX_data_visible_pose_bones(const bContext *C, ListBase *list);
 struct bGPdata *CTX_data_gpencil_data(const bContext *C);
 struct bGPDlayer *CTX_data_active_gpencil_layer(const bContext *C);
 struct bGPDframe *CTX_data_active_gpencil_frame(const bContext *C);
-struct Palette *CTX_data_active_gpencil_palette(const bContext *C);
-struct PaletteColor *CTX_data_active_gpencil_palettecolor(const bContext *C);
 struct Brush *CTX_data_active_gpencil_brush(const bContext *C);
 int CTX_data_visible_gpencil_layers(const bContext *C, ListBase *list);
 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);
 
 /* Will Return NULL if depsgraph is not allocated yet.
diff --git a/source/blender/blenkernel/intern/context.c b/source/blender/blenkernel/intern/context.c
index c17e2749980..3179974231b 100644
--- a/source/blender/blenkernel/intern/context.c
+++ b/source/blender/blenkernel/intern/context.c
@@ -1203,16 +1203,6 @@ bGPDlayer *CTX_data_active_gpencil_layer(const bContext *C)
 	return ctx_data_pointer_get(C, "active_gpencil_layer");
 }
 
-Palette *CTX_data_active_gpencil_palette(const bContext *C)
-{
-	return ctx_data_pointer_get(C, "active_gpencil_palette");
-}
-
-PaletteColor *CTX_data_active_gpencil_palettecolor(const bContext *C)
-{
-	return ctx_data_pointer_get(C, "active_gpencil_palettecolor");
-}
-
 Brush *CTX_data_active_gpencil_brush(const bContext *C)
 {
 	return ctx_data_pointer_get(C, "active_gpencil_brush");
@@ -1238,31 +1228,6 @@ int CTX_data_editable_gpencil_strokes(const bContext *C, ListBase *list)
 	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_palettecolors(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);
diff --git a/source/blender/editors/screen/screen_context.c b/source/blender/editors/screen/screen_context.c
index 466ddaa3463..79d5bfa220d 100644
--- a/source/blender/editors/screen/screen_context.c
+++ b/source/blender/editors/screen/screen_context.c
@@ -85,7 +85,6 @@ const char *screen_context_dir[] = {
 	"gpencil_data", "gpencil_data_owner", /* grease pencil data */
 	"visible_gpencil_layers", "editable_gpencil_layers", "editable_gpencil_strokes",
 	"active_gpencil_layer", "active_gpencil_frame", "active_gpencil_brush",
-	"active_palette", "active_palettecolor", "available_palettes", "available_palettecolors",
 	"active_operator", "selected_editable_fcurves",
 	NULL};



More information about the Bf-blender-cvs mailing list