Merge branch 'blender-v2.83-release'
This commit is contained in:
commit
11a6d840da
|
@ -49,7 +49,9 @@ class DATA_PT_empty(DataButtonsPanel, Panel):
|
|||
col.prop(ob, "empty_image_offset", text="Y", index=1)
|
||||
|
||||
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.prop(ob, "show_empty_image_orthographic", text="Display Orthographic")
|
||||
col.prop(ob, "show_empty_image_perspective", text="Display Perspective")
|
||||
|
|
|
@ -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 */
|
||||
char depth_mode = DRW_state_is_depth() ? OB_EMPTY_IMAGE_DEPTH_DEFAULT : ob->empty_image_depth;
|
||||
DRWPass *pass = NULL;
|
||||
switch (depth_mode) {
|
||||
case OB_EMPTY_IMAGE_DEPTH_DEFAULT:
|
||||
pass = (use_alpha_blend) ? psl->image_empties_blend_ps : psl->image_empties_ps;
|
||||
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 ((ob->dtx & OB_DRAWXRAY) != 0) {
|
||||
/* Object In Front overrides image empty depth mode. */
|
||||
pass = psl->image_empties_front_ps;
|
||||
}
|
||||
else {
|
||||
switch (depth_mode) {
|
||||
case OB_EMPTY_IMAGE_DEPTH_DEFAULT:
|
||||
pass = (use_alpha_blend) ? psl->image_empties_blend_ps : psl->image_empties_ps;
|
||||
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) {
|
||||
|
|
Loading…
Reference in New Issue