diff options
| author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2011-12-28 02:12:46 +0400 |
|---|---|---|
| committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2011-12-28 02:12:46 +0400 |
| commit | 0896a227232f741b6028219a208ae60e78515406 (patch) | |
| tree | 2ad38505a7d5c960bdcd5537dbc6e319165ac118 /release/scripts/startup/bl_ui/properties_render.py | |
| parent | 6bfbb26f329f8d98a0ae0844f2cee0ba92c90d53 (diff) | |
| parent | 0059b8dd96bf065406441112f604e59f65d844d6 (diff) | |
Merged changes in the trunk up to revision 42902.
Conflicts resolved:
source/blender/editors/space_view3d/drawobject.c
source/blender/makesdna/DNA_mesh_types.h
source/blender/python/intern/bpy.c
Diffstat (limited to 'release/scripts/startup/bl_ui/properties_render.py')
| -rw-r--r-- | release/scripts/startup/bl_ui/properties_render.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/release/scripts/startup/bl_ui/properties_render.py b/release/scripts/startup/bl_ui/properties_render.py index 94c5c5c9b40..f77d3f6fbe4 100644 --- a/release/scripts/startup/bl_ui/properties_render.py +++ b/release/scripts/startup/bl_ui/properties_render.py @@ -51,7 +51,7 @@ class RenderButtonsPanel(): @classmethod def poll(cls, context): rd = context.scene.render - return (context.scene and rd.use_game_engine is False) and (rd.engine in cls.COMPAT_ENGINES) + return context.scene and (rd.engine in cls.COMPAT_ENGINES) class RENDER_PT_render(RenderButtonsPanel, Panel): @@ -1077,7 +1077,7 @@ class RENDER_PT_encoding(RenderButtonsPanel, Panel): class RENDER_PT_bake(RenderButtonsPanel, Panel): bl_label = "Bake" bl_options = {'DEFAULT_CLOSED'} - COMPAT_ENGINES = {'BLENDER_RENDER'} + COMPAT_ENGINES = {'BLENDER_RENDER', 'BLENDER_GAME'} def draw(self, context): layout = self.layout |