[Bf-blender-cvs] [3633a79789d] master: Cleanup: correct misleading classmethod arg

Campbell Barton noreply at git.blender.org
Fri Apr 19 07:36:47 CEST 2019


Commit: 3633a79789d7b47fece7924dc6fe99432fa5cac2
Author: Campbell Barton
Date:   Fri Apr 19 07:36:07 2019 +0200
Branches: master
https://developer.blender.org/rB3633a79789d7b47fece7924dc6fe99432fa5cac2

Cleanup: correct misleading classmethod arg

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

M	intern/cycles/app/io_export_cycles_xml.py
M	intern/cycles/blender/addon/ui.py
M	release/scripts/modules/bpy_extras/object_utils.py
M	release/scripts/startup/bl_ui/properties_output.py
M	release/scripts/startup/bl_ui/space_image.py
M	release/scripts/startup/bl_ui/space_view3d_toolbar.py

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

diff --git a/intern/cycles/app/io_export_cycles_xml.py b/intern/cycles/app/io_export_cycles_xml.py
index a1b42f72f7c..d2c6dc493e8 100644
--- a/intern/cycles/app/io_export_cycles_xml.py
+++ b/intern/cycles/app/io_export_cycles_xml.py
@@ -64,7 +64,7 @@ class RenderButtonsPanel():
     bl_context = "render"
 
     @classmethod
-    def poll(self, context):
+    def poll(cls, context):
         return context.engine == 'CYCLES'
 
 
diff --git a/intern/cycles/blender/addon/ui.py b/intern/cycles/blender/addon/ui.py
index 4b0e179a388..16ad3716d4b 100644
--- a/intern/cycles/blender/addon/ui.py
+++ b/intern/cycles/blender/addon/ui.py
@@ -185,7 +185,7 @@ class CYCLES_RENDER_PT_sampling_sub_samples(CyclesButtonsPanel, Panel):
     bl_parent_id = "CYCLES_RENDER_PT_sampling"
 
     @classmethod
-    def poll(self, context):
+    def poll(cls, context):
         scene = context.scene
         cscene = scene.cycles
         return cscene.progressive != 'PATH' and use_branched_path(context)
@@ -256,7 +256,7 @@ class CYCLES_RENDER_PT_sampling_total(CyclesButtonsPanel, Panel):
     bl_parent_id = "CYCLES_RENDER_PT_sampling"
 
     @classmethod
-    def poll(self, context):
+    def poll(cls, context):
         scene = context.scene
         cscene = scene.cycles
 
@@ -312,7 +312,7 @@ class CYCLES_RENDER_PT_subdivision(CyclesButtonsPanel, Panel):
     bl_options = {'DEFAULT_CLOSED'}
 
     @classmethod
-    def poll(self, context):
+    def poll(cls, context):
         return (context.scene.render.engine == 'CYCLES') and (context.scene.cycles.feature_set == 'EXPERIMENTAL')
 
     def draw(self, context):
diff --git a/release/scripts/modules/bpy_extras/object_utils.py b/release/scripts/modules/bpy_extras/object_utils.py
index d08b98772f5..cd74aa39916 100644
--- a/release/scripts/modules/bpy_extras/object_utils.py
+++ b/release/scripts/modules/bpy_extras/object_utils.py
@@ -187,7 +187,7 @@ class AddObjectHelper:
     )
 
     @classmethod
-    def poll(self, context):
+    def poll(cls, context):
         return context.scene.library is None
 
 
diff --git a/release/scripts/startup/bl_ui/properties_output.py b/release/scripts/startup/bl_ui/properties_output.py
index f24adbbcf91..00be0f1a792 100644
--- a/release/scripts/startup/bl_ui/properties_output.py
+++ b/release/scripts/startup/bl_ui/properties_output.py
@@ -313,7 +313,7 @@ class RENDER_PT_output_views(RenderOutputButtonsPanel, Panel):
     COMPAT_ENGINES = {'BLENDER_RENDER', 'BLENDER_EEVEE', 'BLENDER_WORKBENCH'}
 
     @classmethod
-    def poll(self, context):
+    def poll(cls, context):
         rd = context.scene.render
         return rd.use_multiview
 
diff --git a/release/scripts/startup/bl_ui/space_image.py b/release/scripts/startup/bl_ui/space_image.py
index 81c411a06cb..dd6dd823a64 100644
--- a/release/scripts/startup/bl_ui/space_image.py
+++ b/release/scripts/startup/bl_ui/space_image.py
@@ -963,7 +963,7 @@ class IMAGE_PT_paint_color(Panel, ImagePaintPanel):
     bl_label = "Color Picker"
 
     @classmethod
-    def poll(self, context):
+    def poll(cls, context):
         settings = context.tool_settings.image_paint
         brush = settings.brush
         capabilities = brush.image_paint_capabilities
@@ -987,7 +987,7 @@ class IMAGE_PT_paint_swatches(Panel, ImagePaintPanel):
     bl_options = {'DEFAULT_CLOSED'}
 
     @classmethod
-    def poll(self, context):
+    def poll(cls, context):
         settings = context.tool_settings.image_paint
         brush = settings.brush
         capabilities = brush.image_paint_capabilities
@@ -1010,7 +1010,7 @@ class IMAGE_PT_paint_gradient(Panel, ImagePaintPanel):
     bl_options = {'DEFAULT_CLOSED'}
 
     @classmethod
-    def poll(self, context):
+    def poll(cls, context):
         settings = context.tool_settings.image_paint
         brush = settings.brush
         capabilities = brush.image_paint_capabilities
@@ -1041,7 +1041,7 @@ class IMAGE_PT_paint_clone(Panel, ImagePaintPanel):
     bl_options = {'DEFAULT_CLOSED'}
 
     @classmethod
-    def poll(self, context):
+    def poll(cls, context):
         settings = context.tool_settings.image_paint
         brush = settings.brush
 
@@ -1068,7 +1068,7 @@ class IMAGE_PT_paint_options(Panel, ImagePaintPanel):
     bl_options = {'DEFAULT_CLOSED'}
 
     @classmethod
-    def poll(self, context):
+    def poll(cls, context):
         settings = context.tool_settings.image_paint
         brush = settings.brush
         capabilities = brush.image_paint_capabilities
diff --git a/release/scripts/startup/bl_ui/space_view3d_toolbar.py b/release/scripts/startup/bl_ui/space_view3d_toolbar.py
index 35576063b25..a87038a524d 100644
--- a/release/scripts/startup/bl_ui/space_view3d_toolbar.py
+++ b/release/scripts/startup/bl_ui/space_view3d_toolbar.py
@@ -389,8 +389,8 @@ class VIEW3D_PT_tools_brush_color(Panel, View3DPaintPanel):
     bl_label = "Color Picker"
 
     @classmethod
-    def poll(self, context):
-        settings = self.paint_settings(context)
+    def poll(cls, context):
+        settings = cls.paint_settings(context)
         brush = settings.brush
         if context.image_paint_object:
             capabilities = brush.image_paint_capabilities
@@ -417,8 +417,8 @@ class VIEW3D_PT_tools_brush_swatches(Panel, View3DPaintPanel):
     bl_options = {'DEFAULT_CLOSED'}
 
     @classmethod
-    def poll(self, context):
-        settings = self.paint_settings(context)
+    def poll(cls, context):
+        settings = cls.paint_settings(context)
         brush = settings.brush
         if context.image_paint_object:
             capabilities = brush.image_paint_capabilities
@@ -444,8 +444,8 @@ class VIEW3D_PT_tools_brush_gradient(Panel, View3DPaintPanel):
     bl_options = {'DEFAULT_CLOSED'}
 
     @classmethod
-    def poll(self, context):
-        settings = self.paint_settings(context)
+    def poll(cls, context):
+        settings = cls.paint_settings(context)
         brush = settings.brush
         capabilities = brush.image_paint_capabilities
 
@@ -475,7 +475,7 @@ class VIEW3D_PT_tools_brush_clone(Panel, View3DPaintPanel):
     bl_options = {'DEFAULT_CLOSED'}
 
     @classmethod
-    def poll(self, context):
+    def poll(cls, context):
         settings = self.paint_settings(context)
         brush = settings.brush



More information about the Bf-blender-cvs mailing list