Revert "POV : fix registering"

This reverts commit a885950.

render_povray/__init__.py

@@ -250,8 +250,7 @@ def recursive_overwrite(src, dest, ignore=None):
         with tempfile.TemporaryDirectory() as temp_dir_path:
             temp_zip_path = os.path.join(temp_dir_path, 'master.zip')
 
-            # Download zip archive of latest addons master branch commit
-            # More work needed so we also get the pov presets from addons shared folder.
+            # Download zip archive of latest addons master branch commit (So we also get presets)
             # switch this URL back to the BF hosted one as soon as gitweb snapshot gets fixed
             url = 'https://github.com/blender/blender-addons/archive/refs/heads/master.zip'
             try:
@@ -398,10 +397,7 @@ def draw(self, context):
         layout.operator("pov.update_addon", icon='FILE_REFRESH')
 
 
-classes = (
-    POV_OT_update_addon, # already registered as a subclass
-    PovrayPreferences
-)
+classes = (POV_OT_update_addon, PovrayPreferences)
 
 
 def register():
@@ -414,7 +410,7 @@ def register():
     texturing_properties.register()
     object_properties.register()
     scripting_properties.register()
-    #scenography.register()
+    scenography.register()
     render.register()
     base_ui.register()
     scripting.register()
@@ -426,15 +422,15 @@ def unregister():
     scripting.unregister()
     base_ui.unregister()
     render.unregister()
-    #scenography.unregister()
+    scenography.unregister()
     scripting_properties.unregister()
     object_properties.unregister()
     texturing_properties.unregister()
     shading_properties.unregister()
     scenography_properties.unregister()
     render_properties.unregister()
 
-    for cls in classes:
+    for cls in reversed(classes):
         unregister_class(cls)
 
 

render_povray/object_gui.py

@@ -34,11 +34,8 @@
 
 for member in dir(properties_data_modifier):
     subclass = getattr(properties_data_modifier, member)
-    try:
+    if hasattr(subclass, "COMPAT_ENGINES"):
         subclass.COMPAT_ENGINES.add('POVRAY_RENDER')
-    except BaseException as e:
-        print(e.__doc__)
-        print('An exception occurred: {}'.format(e))
 del properties_data_modifier
 
 

render_povray/object_primitives.py

@@ -1769,5 +1769,5 @@ def register():
 
 
 def unregister():
-    for cls in reversed(classes):
+    for cls in classes:
         unregister_class(cls)

render_povray/render.py

@@ -17,9 +17,7 @@
 # #**** END GPL LICENSE BLOCK #****
 
 # <pep8 compliant>
-
 """Wirte the POV file using this file's functions and some from other modules then render it."""
-
 import bpy
 import subprocess
 import os
@@ -1809,11 +1807,7 @@ def execute(self, context):
         return {'FINISHED'}
 
 
-classes = (
-    PovrayRender,
-    RenderPovTexturePreview,
-    RunPovTextRender,
-)
+classes = (PovrayRender, RenderPovTexturePreview, RunPovTextRender)
 
 
 def register():

render_povray/render_gui.py

@@ -36,38 +36,26 @@
 
 for member in dir(properties_output):
     subclass = getattr(properties_output, member)
-    try:
+    if hasattr(subclass, "COMPAT_ENGINES"):
         subclass.COMPAT_ENGINES.add('POVRAY_RENDER')
-    except BaseException as e:
-        print(e.__doc__)
-        print('An exception occurred: {}'.format(e))
-        pass
 del properties_output
 
 from bl_ui import properties_freestyle
 
 for member in dir(properties_freestyle):
     subclass = getattr(properties_freestyle, member)
-    try:
+    if hasattr(subclass, "COMPAT_ENGINES"):
         if not (subclass.bl_space_type == 'PROPERTIES' and subclass.bl_context == "render"):
             subclass.COMPAT_ENGINES.add('POVRAY_RENDER')
             # subclass.bl_parent_id = "RENDER_PT_POV_filter"
-    except BaseException as e:
-        print(e.__doc__)
-        print('An exception occurred: {}'.format(e))
-        pass
 del properties_freestyle
 
 from bl_ui import properties_view_layer
 
 for member in dir(properties_view_layer):
     subclass = getattr(properties_view_layer, member)
-    try:
+    if hasattr(subclass, "COMPAT_ENGINES"):
         subclass.COMPAT_ENGINES.add('POVRAY_RENDER')
-    except BaseException as e:
-        print(e.__doc__)
-        print('An exception occurred: {}'.format(e))
-        pass
 del properties_view_layer
 
 # Use some of the existing buttons.
@@ -452,17 +440,13 @@ def rad_panel_func(self, context):
     '''
     for member in dir(render_freestyle_svg):
         subclass = getattr(render_freestyle_svg, member)
-        try:
+        if hasattr(subclass, "COMPAT_ENGINES"):
             subclass.COMPAT_ENGINES.add('POVRAY_RENDER')
             if subclass.bl_idname == "RENDER_PT_SVGExporterPanel":
                 subclass.bl_parent_id = "RENDER_PT_POV_filter"
                 subclass.bl_options = {'HIDE_HEADER'}
                 # subclass.bl_order = 11
                 print(subclass.bl_info)
-        except BaseException as e:
-            print(e.__doc__)
-            print('An exception occurred: {}'.format(e))
-            pass
 
     # del render_freestyle_svg.RENDER_PT_SVGExporterPanel.bl_parent_id
 
@@ -553,10 +537,10 @@ def draw(self, context):
 def register():
     for cls in classes:
         register_class(cls)
-    RENDER_PT_POV_radiosity.prepend(rad_panel_func)
+    bpy.types.RENDER_PT_POV_radiosity.prepend(rad_panel_func)
 
 
 def unregister():
-    RENDER_PT_POV_radiosity.remove(rad_panel_func)
+    bpy.types.RENDER_PT_POV_radiosity.remove(rad_panel_func)
     for cls in reversed(classes):
         unregister_class(cls)

render_povray/render_properties.py

@@ -672,9 +672,7 @@ class RenderPovSettingsScene(PropertyGroup):
     )
 
 
-classes = (
-    RenderPovSettingsScene,
-)
+classes = (RenderPovSettingsScene,)
 
 
 def register():

render_povray/scenography.py

@@ -23,7 +23,7 @@
 with world, sky, atmospheric effects such as rainbows or smoke """
 
 import bpy
-
+from bpy.utils import register_class, unregister_class
 import os
 from imghdr import what  # imghdr is a python lib to identify image file types
 from math import atan, pi, sqrt, degrees
@@ -832,3 +832,16 @@ def export_smoke(file, smoke_obj_name, smoke_path, comments, global_matrix, writ
         # file.write("               frequency 0\n")
         # file.write("   }\n")
         # file.write("}\n")
+
+
+classes = ()
+
+
+def register():
+    for cls in classes:
+        register_class(cls)
+
+
+def unregister():
+    for cls in classes:
+        unregister_class(cls)

render_povray/scenography_gui.py

@@ -31,12 +31,8 @@
 
 for member in dir(properties_data_camera):
     subclass = getattr(properties_data_camera, member)
-    try:
+    if hasattr(subclass, "COMPAT_ENGINES"):
         subclass.COMPAT_ENGINES.add('POVRAY_RENDER')
-    except BaseException as e:
-        print(e.__doc__)
-        print('An exception occurred: {}'.format(e))
-        pass
 del properties_data_camera
 
 # ##################################
@@ -54,115 +50,79 @@
 
 for member in dir(properties_physics_common):
     subclass = getattr(properties_physics_common, member)
-    try:
+    if hasattr(subclass, "COMPAT_ENGINES"):
         subclass.COMPAT_ENGINES.add('POVRAY_RENDER')
-    except BaseException as e:
-        print(e.__doc__)
-        print('An exception occurred: {}'.format(e))
-        pass
 del properties_physics_common
 
 # Physics Rigid Bodies wrapping every class 'as is'
 from bl_ui import properties_physics_rigidbody
 
 for member in dir(properties_physics_rigidbody):
     subclass = getattr(properties_physics_rigidbody, member)
-    try:
+    if hasattr(subclass, "COMPAT_ENGINES"):
         subclass.COMPAT_ENGINES.add('POVRAY_RENDER')
-    except BaseException as e:
-        print(e.__doc__)
-        print('An exception occurred: {}'.format(e))
-        pass
 del properties_physics_rigidbody
 
 # Physics Rigid Body Constraint wrapping every class 'as is'
 from bl_ui import properties_physics_rigidbody_constraint
 
 for member in dir(properties_physics_rigidbody_constraint):
     subclass = getattr(properties_physics_rigidbody_constraint, member)
-    try:
+    if hasattr(subclass, "COMPAT_ENGINES"):
         subclass.COMPAT_ENGINES.add('POVRAY_RENDER')
-    except BaseException as e:
-        print(e.__doc__)
-        print('An exception occurred: {}'.format(e))
-        pass
 del properties_physics_rigidbody_constraint
 
 # Physics Smoke and fluids wrapping every class 'as is'
 from bl_ui import properties_physics_fluid
 
 for member in dir(properties_physics_fluid):
     subclass = getattr(properties_physics_fluid, member)
-    try:
+    if hasattr(subclass, "COMPAT_ENGINES"):
         subclass.COMPAT_ENGINES.add('POVRAY_RENDER')
-    except BaseException as e:
-        print(e.__doc__)
-        print('An exception occurred: {}'.format(e))
-        pass
 del properties_physics_fluid
 
 # Physics softbody wrapping every class 'as is'
 from bl_ui import properties_physics_softbody
 
 for member in dir(properties_physics_softbody):
     subclass = getattr(properties_physics_softbody, member)
-    try:
+    if hasattr(subclass, "COMPAT_ENGINES"):
         subclass.COMPAT_ENGINES.add('POVRAY_RENDER')
-    except BaseException as e:
-        print(e.__doc__)
-        print('An exception occurred: {}'.format(e))
-        pass
 del properties_physics_softbody
 
 # Physics Field wrapping every class 'as is'
 from bl_ui import properties_physics_field
 
 for member in dir(properties_physics_field):
     subclass = getattr(properties_physics_field, member)
-    try:
+    if hasattr(subclass, "COMPAT_ENGINES"):
         subclass.COMPAT_ENGINES.add('POVRAY_RENDER')
-    except BaseException as e:
-        print(e.__doc__)
-        print('An exception occurred: {}'.format(e))
-        pass
 del properties_physics_field
 
 # Physics Cloth wrapping every class 'as is'
 from bl_ui import properties_physics_cloth
 
 for member in dir(properties_physics_cloth):
     subclass = getattr(properties_physics_cloth, member)
-    try:
+    if hasattr(subclass, "COMPAT_ENGINES"):
         subclass.COMPAT_ENGINES.add('POVRAY_RENDER')
-    except BaseException as e:
-        print(e.__doc__)
-        print('An exception occurred: {}'.format(e))
-        pass
 del properties_physics_cloth
 
 # Physics Dynamic Paint wrapping every class 'as is'
 from bl_ui import properties_physics_dynamicpaint
 
 for member in dir(properties_physics_dynamicpaint):
     subclass = getattr(properties_physics_dynamicpaint, member)
-    try:
+    if hasattr(subclass, "COMPAT_ENGINES"):
         subclass.COMPAT_ENGINES.add('POVRAY_RENDER')
-    except BaseException as e:
-        print(e.__doc__)
-        print('An exception occurred: {}'.format(e))
-        pass
 del properties_physics_dynamicpaint
 
 from bl_ui import properties_particle
 
 for member in dir(properties_particle):  # add all "particle" panels from blender
     subclass = getattr(properties_particle, member)
-    try:
+    if hasattr(subclass, "COMPAT_ENGINES"):
         subclass.COMPAT_ENGINES.add('POVRAY_RENDER')
-    except BaseException as e:
-        print(e.__doc__)
-        print('An exception occurred: {}'.format(e))
-        pass
 del properties_particle
 
 
@@ -790,10 +750,12 @@ def register():
 
     for cls in classes:
         register_class(cls)
-    LIGHT_PT_POV_light.prepend(light_panel_func)
+    bpy.types.LIGHT_PT_POV_light.prepend(light_panel_func)
 
 
 def unregister():
-    LIGHT_PT_POV_light.remove(light_panel_func)
+
+    bpy.types.LIGHT_PT_POV_light.remove(light_panel_func)
     for cls in reversed(classes):
         unregister_class(cls)
+