diff options
| author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2012-09-30 17:16:55 +0400 |
|---|---|---|
| committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2012-09-30 17:16:55 +0400 |
| commit | e91f33101ff0999e07f7ce941f31dca793d954e7 (patch) | |
| tree | 83c0d933f2ac1d063e2c57aaded58fd09d8d5712 /release/scripts/startup/bl_ui/properties_render.py | |
| parent | a42ba82f638e481d7fd3c3ed2ba05c331ef6717e (diff) | |
| parent | 818b2e81da7d5f3e04439e3b4fef5c7ce5263b5b (diff) | |
Merged changes in the trunk up to revision 50956.
Conflicts resolved:
source/blender/editors/interface/resources.c
Diffstat (limited to 'release/scripts/startup/bl_ui/properties_render.py')
| -rw-r--r-- | release/scripts/startup/bl_ui/properties_render.py | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/release/scripts/startup/bl_ui/properties_render.py b/release/scripts/startup/bl_ui/properties_render.py index 47689b9be73..31a613d07bf 100644 --- a/release/scripts/startup/bl_ui/properties_render.py +++ b/release/scripts/startup/bl_ui/properties_render.py @@ -866,7 +866,6 @@ class RENDER_PT_shading(RenderButtonsPanel, Panel): col = split.column() col.prop(rd, "use_raytrace", text="Ray Tracing") - col.prop(rd, "use_color_unpremultiply") col.prop(rd, "alpha_mode", text="Alpha") |