[Bf-extensions-cvs] [860d8d71] master: Cleanup: remove checks for Blender v2.7x

Campbell Barton noreply at git.blender.org
Tue Oct 20 04:20:51 CEST 2020


Commit: 860d8d710421c432c4701b2a4d393c6172e329f5
Author: Campbell Barton
Date:   Tue Oct 20 13:19:34 2020 +1100
Branches: master
https://developer.blender.org/rBA860d8d710421c432c4701b2a4d393c6172e329f5

Cleanup: remove checks for Blender v2.7x

Note that add-ons in the official repositories need not support
multiple Blender versions.

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

M	amaranth/render/samples_scene.py

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

diff --git a/amaranth/render/samples_scene.py b/amaranth/render/samples_scene.py
index dbe4daf8..44f3361f 100644
--- a/amaranth/render/samples_scene.py
+++ b/amaranth/render/samples_scene.py
@@ -206,21 +206,13 @@ def init():
         scene.amaranth_cycles_list_sampling = bpy.props.BoolProperty(
             default=False,
             name="Samples Per:")
-        # Note: add versioning code to adress changes introduced in 2.79.1
-        if bpy.app.version >= (2, 79, 1):
-            from cycles import properties as _cycles_props
-            _cycles_props.CyclesRenderSettings.use_samples_final = BoolProperty(
-                    name="Use Final Render Samples",
-                    description="Use current shader samples as final render samples",
-                    default=False
-                    )
-        else:
-            bpy.types.CyclesRenderSettings.use_samples_final = BoolProperty(
-                    name="Use Final Render Samples",
-                    description="Use current shader samples as final render samples",
-                    default=False
-                    )
-
+        # Note: add versioning code to address changes introduced in 2.79.1
+        from cycles import properties as _cycles_props
+        _cycles_props.CyclesRenderSettings.use_samples_final = BoolProperty(
+            name="Use Final Render Samples",
+            description="Use current shader samples as final render samples",
+            default=False,
+        )
 
 
 def clear():
@@ -235,20 +227,14 @@ def register():
     bpy.utils.register_class(AMTH_RENDER_OT_cycles_samples_percentage)
     bpy.utils.register_class(AMTH_RENDER_OT_cycles_samples_percentage_set)
     if utils.cycles_exists():
-        if bpy.app.version >= (2, 79, 1):
-            bpy.types.CYCLES_RENDER_PT_sampling.append(render_cycles_scene_samples)
-        else:
-            bpy.types.CyclesRender_PT_sampling.append(render_cycles_scene_samples)
+        bpy.types.CYCLES_RENDER_PT_sampling.append(render_cycles_scene_samples)
 
 
 def unregister():
     bpy.utils.unregister_class(AMTH_RENDER_OT_cycles_samples_percentage)
     bpy.utils.unregister_class(AMTH_RENDER_OT_cycles_samples_percentage_set)
     if utils.cycles_exists():
-        if bpy.app.version >= (2, 79, 1):
-            bpy.types.CYCLES_RENDER_PT_sampling.remove(render_cycles_scene_samples)
-        else:
-            bpy.types.CyclesRender_PT_sampling.remove(render_cycles_scene_samples)
+        bpy.types.CYCLES_RENDER_PT_sampling.remove(render_cycles_scene_samples)
 
 
     clear()



More information about the Bf-extensions-cvs mailing list