diff options
author | Campbell Barton <ideasman42@gmail.com> | 2013-04-03 09:16:15 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2013-04-03 09:16:15 +0400 |
commit | fc3c13c309d065888da3eb864cb13b4feef0f584 (patch) | |
tree | de49302c580220609789c7a7750c2b74213f3b07 | |
parent | 6ee5b2d40cd1065dfd98920894c039a82ab17b6f (diff) |
fix [#34825] Transparent background of Empty Images clips objects behind them away when Empty is not selected
allow 'Transparency' option to be used on empty-images.
-rw-r--r-- | release/scripts/startup/bl_ui/properties_object.py | 34 | ||||
-rw-r--r-- | source/blender/editors/space_view3d/drawobject.c | 8 |
2 files changed, 27 insertions, 15 deletions
diff --git a/release/scripts/startup/bl_ui/properties_object.py b/release/scripts/startup/bl_ui/properties_object.py index c5dbe946012..7c32e72b3e3 100644 --- a/release/scripts/startup/bl_ui/properties_object.py +++ b/release/scripts/startup/bl_ui/properties_object.py @@ -204,36 +204,40 @@ class OBJECT_PT_display(ObjectButtonsPanel, Panel): def draw(self, context): layout = self.layout - ob = context.object + obj = context.object split = layout.split() col = split.column() - col.prop(ob, "draw_type", text="Type") + col.prop(obj, "draw_type", text="Type") col = split.column() row = col.row() - row.prop(ob, "show_bounds", text="Bounds") + row.prop(obj, "show_bounds", text="Bounds") sub = row.row() - sub.active = ob.show_bounds - sub.prop(ob, "draw_bounds_type", text="") + sub.active = obj.show_bounds + sub.prop(obj, "draw_bounds_type", text="") split = layout.split() col = split.column() - col.prop(ob, "show_name", text="Name") - col.prop(ob, "show_axis", text="Axis") - if ob.type in {'MESH', 'CURVE', 'SURFACE', 'META', 'FONT'}: + col.prop(obj, "show_name", text="Name") + col.prop(obj, "show_axis", text="Axis") + + obj_type = obj.type + + if obj_type in {'MESH', 'CURVE', 'SURFACE', 'META', 'FONT'}: # Makes no sense for cameras, armtures, etc.! - col.prop(ob, "show_wire", text="Wire") + col.prop(obj, "show_wire", text="Wire") # Only useful with object having faces/materials... - col.prop(ob, "color", text="Object Color") + col.prop(obj, "color", text="Object Color") col = split.column() - col.prop(ob, "show_texture_space", text="Texture Space") - col.prop(ob, "show_x_ray", text="X-Ray") - if ob.type == 'MESH': - col.prop(ob, "show_transparent", text="Transparency") - col.prop(ob, "show_all_edges") + col.prop(obj, "show_texture_space", text="Texture Space") + col.prop(obj, "show_x_ray", text="X-Ray") + if obj_type == 'MESH' or (obj_type == 'EMPTY' and obj.empty_draw_type == 'IMAGE'): + col.prop(obj, "show_transparent", text="Transparency") + if obj_type == 'MESH': + col.prop(obj, "show_all_edges") class OBJECT_PT_duplication(ObjectButtonsPanel, Panel): diff --git a/source/blender/editors/space_view3d/drawobject.c b/source/blender/editors/space_view3d/drawobject.c index d203da06f12..2f0a2b7cb7a 100644 --- a/source/blender/editors/space_view3d/drawobject.c +++ b/source/blender/editors/space_view3d/drawobject.c @@ -6363,6 +6363,14 @@ void draw_object(Scene *scene, ARegion *ar, View3D *v3d, Base *base, const short ED_view3d_after_add(&v3d->afterdraw_xray, base, dflag); return; } + + /* allow transp option for empty images */ + if (ob->type == OB_EMPTY && ob->empty_drawtype == OB_EMPTY_IMAGE) { + if (!v3d->xray && !v3d->transp && !(ob->dtx & OB_DRAWXRAY) && (ob->dtx & OB_DRAWTRANSP)) { + ED_view3d_after_add(&v3d->afterdraw_transp, base, dflag); + return; + } + } } } |