[Bf-blender-cvs] [ebeb3b84c00] soc-2019-npr: LANPR: Panels in object and collection page always display when engine is selected

[YimingWu]

Commit: ebeb3b84c00be574f2c9cf6fde06515f4ee550a2
Author: YimingWu
Date:   Mon Jul 8 16:29:51 2019 +0800
Branches: soc-2019-npr
https://developer.blender.org/rBebeb3b84c00be574f2c9cf6fde06515f4ee550a2

LANPR: Panels in object and collection page always display when engine is selected

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

M	release/scripts/startup/bl_ui/properties_collection.py
M	release/scripts/startup/bl_ui/properties_object.py

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

diff --git a/release/scripts/startup/bl_ui/properties_collection.py b/release/scripts/startup/bl_ui/properties_collection.py
index d335424321b..a47c5d89e57 100644
--- a/release/scripts/startup/bl_ui/properties_collection.py
+++ b/release/scripts/startup/bl_ui/properties_collection.py
@@ -68,7 +68,7 @@ class COLLECTION_PT_lanpr_collection(CollectionButtonsPanel, Panel):
 
     @classmethod
     def poll(cls, context):
-        return context.scene.lanpr.enabled
+        return context.scene.render.engine == 'BLENDER_LANPR' or context.scene.lanpr.enabled
 
     def draw(self,context):
         layout = self.layout
diff --git a/release/scripts/startup/bl_ui/properties_object.py b/release/scripts/startup/bl_ui/properties_object.py
index de2717bbbbc..01240d361da 100644
--- a/release/scripts/startup/bl_ui/properties_object.py
+++ b/release/scripts/startup/bl_ui/properties_object.py
@@ -408,7 +408,7 @@ class OBJECT_PT_lanpr(ObjectButtonsPanel, Panel):
 
     @classmethod
     def poll(cls, context):
-        return (context.object) and (context.scene.lanpr.enabled)
+        return context.scene.render.engine == 'BLENDER_LANPR' or context.scene.lanpr.enabled
 
     def draw(self, context):
         layout=self.layout