archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Fix T75613: "In Front" setting did not override image empty "Depth"

Browse Source 
Differential Revision: https://developer.blender.org/D7418

Reviewers: campbellbarton, brecht
This commit is contained in:
Vincent Blankfield
2020-04-15 18:49:32 +02:00
committed by Jacques Lucke
parent f250b1f5a0
commit eb46b55e56
2 changed files with 19 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
release/scripts/startup/bl_ui/properties_data_empty.py
View File

@@ -49,7 +49,9 @@ class DATA_PT_empty(DataButtonsPanel, Panel):
col.prop(ob, "empty_image_offset", text="Y", index=1) col.prop(ob, "empty_image_offset", text="Y", index=1)
col = layout.column() col = layout.column()
col.row().prop(ob, "empty_image_depth", text="Depth", expand=True) depth_row = col.row()
depth_row.enabled = not ob.show_in_front
depth_row.prop(ob, "empty_image_depth", text="Depth", expand=True)
col.row().prop(ob, "empty_image_side", text="Side", expand=True) col.row().prop(ob, "empty_image_side", text="Side", expand=True)
col.prop(ob, "show_empty_image_orthographic", text="Display Orthographic") col.prop(ob, "show_empty_image_orthographic", text="Display Orthographic")
col.prop(ob, "show_empty_image_perspective", text="Display Perspective") col.prop(ob, "show_empty_image_perspective", text="Display Perspective")

26
source/blender/draw/engines/overlay/overlay_image.c
View File

@@ -395,16 +395,22 @@ void OVERLAY_image_empty_cache_populate(OVERLAY_Data *vedata, Object *ob)
/* Use the actual depth if we are doing depth tests to determine the distance to the object */ /* Use the actual depth if we are doing depth tests to determine the distance to the object */
char depth_mode = DRW_state_is_depth() ? OB_EMPTY_IMAGE_DEPTH_DEFAULT : ob->empty_image_depth; char depth_mode = DRW_state_is_depth() ? OB_EMPTY_IMAGE_DEPTH_DEFAULT : ob->empty_image_depth;
DRWPass *pass = NULL; DRWPass *pass = NULL;
switch (depth_mode) { if ((ob->dtx & OB_DRAWXRAY) != 0) {
case OB_EMPTY_IMAGE_DEPTH_DEFAULT: /* Object In Front overrides image empty depth mode. */
pass = (use_alpha_blend) ? psl->image_empties_blend_ps : psl->image_empties_ps; pass = psl->image_empties_front_ps;
break; }
case OB_EMPTY_IMAGE_DEPTH_BACK: else {
pass = psl->image_empties_back_ps; switch (depth_mode) {
break; case OB_EMPTY_IMAGE_DEPTH_DEFAULT:
case OB_EMPTY_IMAGE_DEPTH_FRONT: pass = (use_alpha_blend) ? psl->image_empties_blend_ps : psl->image_empties_ps;
pass = psl->image_empties_front_ps; break;
break; case OB_EMPTY_IMAGE_DEPTH_BACK:
pass = psl->image_empties_back_ps;
break;
case OB_EMPTY_IMAGE_DEPTH_FRONT:
pass = psl->image_empties_front_ps;
break;
}
} }
if (show_frame) { if (show_frame) {