[Bf-extensions-cvs] [37f05387] blender-v2.79-release: Fix for previous commit rBAc471c3765bfb0, sorry about the noise :|
Bastien Montagne
noreply at git.blender.org
Mon Sep 4 15:17:32 CEST 2017
Commit: 37f05387e7a3473c3d0174d2bfd8db5cb4a5e46e
Author: Bastien Montagne
Date: Sat Aug 26 14:30:26 2017 +0200
Branches: blender-v2.79-release
https://developer.blender.org/rBA37f05387e7a3473c3d0174d2bfd8db5cb4a5e46e
Fix for previous commit rBAc471c3765bfb0, sorry about the noise :|
===================================================================
M render_copy_settings/__init__.py
M render_copy_settings/panel.py
===================================================================
diff --git a/render_copy_settings/__init__.py b/render_copy_settings/__init__.py
index d891552a..abd01299 100644
--- a/render_copy_settings/__init__.py
+++ b/render_copy_settings/__init__.py
@@ -71,7 +71,7 @@ class RenderCopySettingsDataSetting(bpy.types.PropertyGroup):
class RenderCopySettingsData(bpy.types.PropertyGroup):
# XXX: The consistency of this collection is delegated to the UI code.
# It should only contain one element for each render setting.
- affected_settings = CollectionProperty(type=RenderCopySettingsSetting,
+ affected_settings = CollectionProperty(type=RenderCopySettingsDataSetting,
name="Affected Settings",
description="The list of all available render settings")
# XXX Unused, but needed for template_list…
@@ -79,7 +79,7 @@ class RenderCopySettingsData(bpy.types.PropertyGroup):
# XXX: The consistency of this collection is delegated to the UI code.
# It should only contain one element for each scene.
- allowed_scenes = CollectionProperty(type=RenderCopySettingsScene,
+ allowed_scenes = CollectionProperty(type=RenderCopySettingsDataScene,
name="Allowed Scenes",
description="The list all scenes in the file")
# XXX Unused, but needed for template_list…
@@ -100,7 +100,7 @@ classes = (
def register():
for cls in classes:
bpy.utils.register_class(cls)
- bpy.types.Scene.render_copy_settings = PointerProperty(type=RenderCopySettings)
+ bpy.types.Scene.render_copy_settings = PointerProperty(type=RenderCopySettingsData)
bpy.app.translations.register(__name__, translations.translations_dict)
diff --git a/render_copy_settings/panel.py b/render_copy_settings/panel.py
index 6b182c1e..db609a15 100644
--- a/render_copy_settings/panel.py
+++ b/render_copy_settings/panel.py
@@ -24,19 +24,19 @@ from . import presets
class RENDER_UL_copy_settings(bpy.types.UIList):
def draw_item(self, context, layout, data, item, icon, active_data, active_propname, index):
- #assert(isinstance(item, (bpy.types.RenderCopySettingsScene, bpy.types.RenderCopySettingsSetting)))
+ #assert(isinstance(item, (bpy.types.RenderCopySettingsScene, bpy.types.RenderCopySettingsDataSetting)))
if self.layout_type in {'DEFAULT', 'COMPACT'}:
- if isinstance(item, bpy.types.RenderCopySettingsSetting):
+ if isinstance(item, bpy.types.RenderCopySettingsDataSetting):
layout.label(item.name, icon_value=icon)
layout.prop(item, "copy", text="")
- else: #elif isinstance(item, bpy.types.RenderCopySettingsScene):
+ else: #elif isinstance(item, bpy.types.RenderCopySettingsDataScene):
layout.prop(item, "allowed", text=item.name, toggle=True)
elif self.layout_type in {'GRID'}:
layout.alignment = 'CENTER'
- if isinstance(item, bpy.types.RenderCopySettingsSetting):
+ if isinstance(item, bpy.types.RenderCopySettingsDataSetting):
layout.label(item.name, icon_value=icon)
layout.prop(item, "copy", text="")
- else: #elif isinstance(item, bpy.types.RenderCopySettingsScene):
+ else: #elif isinstance(item, bpy.types.RenderCopySettingsDataScene):
layout.prop(item, "allowed", text=item.name, toggle=True)
More information about the Bf-extensions-cvs
mailing list