GPencil: Move Object Depth Order to Object

There was a conflict between Object "In Front" and how the strokes were managed in Stroke panel for grease pencil datablock.

In order to keep consistency, the order of the object has been moved to Object level and now it's using the standard "In Front" flag. As all it is 3D, the option "Back" has been removed.

This also fixes the problem with task T62137.

Also related to commit 54ffc4e19dc4 and D4405

1 files changed, 0 insertions, 13 deletions

diff --git a/source/blender/makesrna/intern/rna_gpencil.c b/source/blender/makesrna/intern/rna_gpencil.c
index bc0a28ec883..6203d06c7d5 100644
--- a/source/blender/makesrna/intern/rna_gpencil.c
+++ b/source/blender/makesrna/intern/rna_gpencil.c
@@ -57,13 +57,6 @@ static EnumPropertyItem rna_enum_gpencil_stroke_depth_order_items[] = {
 	{0, NULL, 0, NULL, NULL},
 };
 
-static EnumPropertyItem rna_enum_gpencil_object_depth_order_items[] = {
-	{GP_XRAY_FRONT, "FRONT", 0, "Front", "Display all strokes in front"},
-	{GP_XRAY_3DSPACE, "3DSPACE", 0, "3D Space", "Display strokes relative to other objects in 3D space"},
-	{GP_XRAY_BACK, "BACK", 0, "Back", "Display all strokes last"},
-	{0, NULL, 0, NULL, NULL},
-};
-
 static EnumPropertyItem rna_enum_gpencil_onion_modes_items[] = {
 	{GP_ONION_MODE_ABSOLUTE, "ABSOLUTE", 0, "Frames", "Frames in absolute range of the scene frame"},
 	{GP_ONION_MODE_RELATIVE, "RELATIVE", 0, "Keyframes", "Frames in relative range of the Grease Pencil keyframes"},
@@ -1510,12 +1503,6 @@ static void rna_def_gpencil_data(BlenderRNA *brna)
 		"Defines how the strokes are ordered in 3D space");
 	RNA_def_property_update(prop, NC_GPENCIL | ND_DATA, "rna_GPencil_update");
 
-	prop = RNA_def_property(srna, "object_depth_order", PROP_ENUM, PROP_NONE);
-	RNA_def_property_enum_sdna(prop, NULL, "xray_mode");
-	RNA_def_property_enum_items(prop, rna_enum_gpencil_object_depth_order_items);
-	RNA_def_property_ui_text(prop, "Object Depth Order", "");
-	RNA_def_property_update(prop, NC_GPENCIL | ND_DATA, "rna_GPencil_update");
-
 	/* Flags */
 	prop = RNA_def_property(srna, "use_stroke_edit_mode", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "flag", GP_DATA_STROKE_EDITMODE);