[Bf-blender-cvs] [73ca54283cb] blender2.8: Fixup for recent workspace changes: Python files

Dalai Felinto noreply at git.blender.org
Mon Oct 16 21:59:52 CEST 2017


Commit: 73ca54283cb5e0367eb07556acf07fda7bb0fad1
Author: Dalai Felinto
Date:   Mon Oct 16 17:59:09 2017 -0200
Branches: blender2.8
https://developer.blender.org/rB73ca54283cb5e0367eb07556acf07fda7bb0fad1

Fixup for recent workspace changes: Python files

I wrongly changed some of these files via sed, and apparently overdid
it in some false positives.

===================================================================

M	release/scripts/startup/bl_ui/properties_render_layer.py
M	release/scripts/startup/bl_ui/properties_scene.py

===================================================================

diff --git a/release/scripts/startup/bl_ui/properties_render_layer.py b/release/scripts/startup/bl_ui/properties_render_layer.py
index 99776723fd9..fa80d8dfd45 100644
--- a/release/scripts/startup/bl_ui/properties_render_layer.py
+++ b/release/scripts/startup/bl_ui/properties_render_layer.py
@@ -54,6 +54,7 @@ class RENDERLAYER_PT_layers(RenderLayerButtonsPanel, Panel):
         layout = self.layout
 
         scene = context.scene
+        rd = scene.render
         view_render = scene.view_render
 
         if view_render.engine == 'BLENDER_GAME':
diff --git a/release/scripts/startup/bl_ui/properties_scene.py b/release/scripts/startup/bl_ui/properties_scene.py
index a143433a28e..3356222fb1f 100644
--- a/release/scripts/startup/bl_ui/properties_scene.py
+++ b/release/scripts/startup/bl_ui/properties_scene.py
@@ -332,8 +332,7 @@ class SCENE_PT_rigid_body_world(SceneButtonsPanel, Panel):
     @classmethod
     def poll(cls, context):
         scene = context.scene
-        rd = scene.render
-        return scene and (view_render.engine in cls.COMPAT_ENGINES)
+        return scene and (scene.view_render.engine in cls.COMPAT_ENGINES)
 
     def draw_header(self, context):
         scene = context.scene
@@ -412,13 +411,13 @@ class SCENE_PT_simplify(SceneButtonsPanel, Panel):
     COMPAT_ENGINES = {'BLENDER_RENDER', 'BLENDER_CLAY', 'BLENDER_EEVEE'}
 
     def draw_header(self, context):
-        view_render = context.scene.view_render
+        rd = context.scene.render
         self.layout.prop(rd, "use_simplify", text="")
 
     def draw(self, context):
         layout = self.layout
 
-        view_render = context.scene.view_render
+        rd = context.scene.render
 
         layout.active = rd.use_simplify



More information about the Bf-blender-cvs mailing list