diff options
| author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2013-02-10 14:17:59 +0400 |
|---|---|---|
| committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2013-02-10 14:17:59 +0400 |
| commit | ac9ec06ec121589fedbfeaa10137140b45bfd668 (patch) | |
| tree | ab08f9528136f0b8813593b78621f869d98d655e /release/scripts/startup/bl_ui/properties_render.py | |
| parent | 3c064f4553e4be988fe4fcec450b59b935fa3c80 (diff) | |
| parent | 63af7068ad17f30a526ccb81fbe74253b064bc89 (diff) | |
Merged changes in the trunk up to revision 54421.
Conflicts resolved:
release/datafiles/startup.blend
release/scripts/startup/bl_ui/properties_render.py
source/blender/SConscript
source/blender/blenloader/intern/readfile.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 cb5a473dba1..969cb8d4cad 100644 --- a/release/scripts/startup/bl_ui/properties_render.py +++ b/release/scripts/startup/bl_ui/properties_render.py @@ -43,7 +43,6 @@ class RENDER_MT_framerate_presets(Menu): draw = Menu.draw_preset - class RenderButtonsPanel(): bl_space_type = 'PROPERTIES' bl_region_type = 'WINDOW' |