[Bf-blender-cvs] [e6d11c6ce66] blender2.8: Collections: remove per collection and view layer engine overrides.
Brecht Van Lommel
noreply at git.blender.org
Tue May 8 17:47:34 CEST 2018
Commit: e6d11c6ce66f94549d1fe896c59b67564ae19d68
Author: Brecht Van Lommel
Date: Tue May 8 15:57:20 2018 +0200
Branches: blender2.8
https://developer.blender.org/rBe6d11c6ce66f94549d1fe896c59b67564ae19d68
Collections: remove per collection and view layer engine overrides.
This will be handled by the new view layer override system which will
store data elsewhere, removing the code already for easier refactoring.
===================================================================
M release/scripts/startup/bl_ui/properties_collection.py
M release/scripts/startup/bl_ui/properties_view_layer.py
M source/blender/blenkernel/BKE_layer.h
M source/blender/blenkernel/intern/collection.c
M source/blender/blenkernel/intern/layer.c
M source/blender/blenkernel/intern/object.c
M source/blender/blenkernel/intern/object_dupli.c
M source/blender/blenkernel/intern/object_update.c
M source/blender/blenloader/intern/readfile.c
M source/blender/blenloader/intern/versioning_280.c
M source/blender/blenloader/intern/writefile.c
M source/blender/depsgraph/intern/depsgraph_query_iter.cc
M source/blender/depsgraph/intern/eval/deg_eval_copy_on_write.cc
M source/blender/draw/engines/clay/clay_engine.c
M source/blender/draw/engines/workbench/workbench_materials.c
M source/blender/editors/include/UI_interface.h
M source/blender/editors/interface/interface_ops.c
M source/blender/editors/interface/interface_templates.c
M source/blender/makesdna/DNA_layer_types.h
M source/blender/makesdna/DNA_object_types.h
M source/blender/makesrna/RNA_access.h
M source/blender/makesrna/intern/rna_layer.c
M source/blender/makesrna/intern/rna_object.c
M source/blender/makesrna/intern/rna_ui_api.c
===================================================================
diff --git a/release/scripts/startup/bl_ui/properties_collection.py b/release/scripts/startup/bl_ui/properties_collection.py
index 80598632714..0721ad19f2d 100644
--- a/release/scripts/startup/bl_ui/properties_collection.py
+++ b/release/scripts/startup/bl_ui/properties_collection.py
@@ -59,36 +59,8 @@ class COLLECTION_PT_context_collection(CollectionButtonsPanel, Panel):
layout.prop(collection, "name", text="", icon='COLLAPSEMENU')
-class COLLECTION_PT_clay_settings(CollectionButtonsPanel, Panel):
- bl_label = "Render Settings"
- COMPAT_ENGINES = {'BLENDER_CLAY'}
-
- @classmethod
- def poll(cls, context):
- return context.engine in cls.COMPAT_ENGINES
-
- def draw(self, context):
- layout = self.layout
- scene_props = context.scene.collection_properties['BLENDER_CLAY']
- collection = get_collection_from_context(context)
- collection_props = collection.engine_overrides['BLENDER_CLAY']
-
- col = layout.column()
- col.template_override_property(collection_props, scene_props, "matcap_icon", custom_template="icon_view")
- col.template_override_property(collection_props, scene_props, "matcap_rotation")
- col.template_override_property(collection_props, scene_props, "matcap_hue")
- col.template_override_property(collection_props, scene_props, "matcap_saturation")
- col.template_override_property(collection_props, scene_props, "matcap_value")
- col.template_override_property(collection_props, scene_props, "ssao_factor_cavity")
- col.template_override_property(collection_props, scene_props, "ssao_factor_edge")
- col.template_override_property(collection_props, scene_props, "ssao_distance")
- col.template_override_property(collection_props, scene_props, "ssao_attenuation")
- col.template_override_property(collection_props, scene_props, "hair_brightness_randomness")
-
-
classes = (
COLLECTION_PT_context_collection,
- COLLECTION_PT_clay_settings,
)
if __name__ == "__main__": # only for live edit.
diff --git a/release/scripts/startup/bl_ui/properties_view_layer.py b/release/scripts/startup/bl_ui/properties_view_layer.py
index a8128f04bd4..3c8552c3407 100644
--- a/release/scripts/startup/bl_ui/properties_view_layer.py
+++ b/release/scripts/startup/bl_ui/properties_view_layer.py
@@ -47,316 +47,6 @@ class VIEWLAYER_PT_layer(ViewLayerButtonsPanel, Panel):
layout.prop(rd, "use_single_layer", text="Render Single Layer")
-class VIEWLAYER_PT_clay_settings(ViewLayerButtonsPanel, Panel):
- bl_label = "Render Settings"
- COMPAT_ENGINES = {'BLENDER_CLAY'}
-
- @classmethod
- def poll(cls, context):
- return (context.engine in cls.COMPAT_ENGINES)
-
- def draw(self, context):
- layout = self.layout
- scene = context.scene
- scene_props = scene.layer_properties['BLENDER_CLAY']
- layer = bpy.context.view_layer
- layer_props = layer.engine_overrides['BLENDER_CLAY']
-
- col = layout.column()
- col.template_override_property(layer_props, scene_props, "ssao_samples")
-
-
-class VIEWLAYER_PT_eevee_ambient_occlusion(ViewLayerButtonsPanel, Panel):
- bl_label = "Ambient Occlusion"
- bl_options = {'DEFAULT_CLOSED'}
- COMPAT_ENGINES = {'BLENDER_EEVEE'}
-
- @classmethod
- def poll(cls, context):
- return (context.engine in cls.COMPAT_ENGINES)
-
- def draw_header(self, context):
- scene = context.scene
- scene_props = scene.layer_properties['BLENDER_EEVEE']
- layer = bpy.context.view_layer
- layer_props = layer.engine_overrides['BLENDER_EEVEE']
-
- self.layout.template_override_property(layer_props, scene_props, "gtao_enable", text="")
-
- def draw(self, context):
- layout = self.layout
- scene = context.scene
- scene_props = scene.layer_properties['BLENDER_EEVEE']
- layer = bpy.context.view_layer
- layer_props = layer.engine_overrides['BLENDER_EEVEE']
-
- col = layout.column()
- col.template_override_property(layer_props, scene_props, "gtao_use_bent_normals")
- col.template_override_property(layer_props, scene_props, "gtao_bounce")
- col.template_override_property(layer_props, scene_props, "gtao_distance")
- col.template_override_property(layer_props, scene_props, "gtao_factor")
- col.template_override_property(layer_props, scene_props, "gtao_quality")
-
-
-class VIEWLAYER_PT_eevee_motion_blur(ViewLayerButtonsPanel, Panel):
- bl_label = "Motion Blur"
- bl_options = {'DEFAULT_CLOSED'}
- COMPAT_ENGINES = {'BLENDER_EEVEE'}
-
- @classmethod
- def poll(cls, context):
- return (context.engine in cls.COMPAT_ENGINES)
-
- def draw_header(self, context):
- scene = context.scene
- scene_props = scene.layer_properties['BLENDER_EEVEE']
- layer = bpy.context.view_layer
- layer_props = layer.engine_overrides['BLENDER_EEVEE']
-
- self.layout.template_override_property(layer_props, scene_props, "motion_blur_enable", text="")
-
- def draw(self, context):
- layout = self.layout
- scene = context.scene
- scene_props = scene.layer_properties['BLENDER_EEVEE']
- layer = bpy.context.view_layer
- layer_props = layer.engine_overrides['BLENDER_EEVEE']
-
- col = layout.column()
- col.template_override_property(layer_props, scene_props, "motion_blur_samples")
- col.template_override_property(layer_props, scene_props, "motion_blur_shutter")
-
-
-class VIEWLAYER_PT_eevee_depth_of_field(ViewLayerButtonsPanel, Panel):
- bl_label = "Depth Of Field"
- bl_options = {'DEFAULT_CLOSED'}
- COMPAT_ENGINES = {'BLENDER_EEVEE'}
-
- @classmethod
- def poll(cls, context):
- return (context.engine in cls.COMPAT_ENGINES)
-
- def draw_header(self, context):
- scene = context.scene
- scene_props = scene.layer_properties['BLENDER_EEVEE']
- layer = bpy.context.view_layer
- layer_props = layer.engine_overrides['BLENDER_EEVEE']
-
- self.layout.template_override_property(layer_props, scene_props, "dof_enable", text="")
-
- def draw(self, context):
- layout = self.layout
- scene = context.scene
- scene_props = scene.layer_properties['BLENDER_EEVEE']
- layer = bpy.context.view_layer
- layer_props = layer.engine_overrides['BLENDER_EEVEE']
-
- col = layout.column()
- col.template_override_property(layer_props, scene_props, "bokeh_max_size")
- col.template_override_property(layer_props, scene_props, "bokeh_threshold")
-
-
-class VIEWLAYER_PT_eevee_bloom(ViewLayerButtonsPanel, Panel):
- bl_label = "Bloom"
- bl_options = {'DEFAULT_CLOSED'}
- COMPAT_ENGINES = {'BLENDER_EEVEE'}
-
- @classmethod
- def poll(cls, context):
- return (context.engine in cls.COMPAT_ENGINES)
-
- def draw_header(self, context):
- scene = context.scene
- scene_props = scene.layer_properties['BLENDER_EEVEE']
- layer = bpy.context.view_layer
- layer_props = layer.engine_overrides['BLENDER_EEVEE']
-
- self.layout.template_override_property(layer_props, scene_props, "bloom_enable", text="")
-
- def draw(self, context):
- layout = self.layout
- scene = context.scene
- scene_props = scene.layer_properties['BLENDER_EEVEE']
- layer = bpy.context.view_layer
- layer_props = layer.engine_overrides['BLENDER_EEVEE']
-
- col = layout.column()
- col.template_override_property(layer_props, scene_props, "bloom_threshold")
- col.template_override_property(layer_props, scene_props, "bloom_knee")
- col.template_override_property(layer_props, scene_props, "bloom_radius")
- col.template_override_property(layer_props, scene_props, "bloom_color")
- col.template_override_property(layer_props, scene_props, "bloom_intensity")
- col.template_override_property(layer_props, scene_props, "bloom_clamp")
-
-
-class VIEWLAYER_PT_eevee_volumetric(ViewLayerButtonsPanel, Panel):
- bl_label = "Volumetric"
- bl_options = {'DEFAULT_CLOSED'}
- COMPAT_ENGINES = {'BLENDER_EEVEE'}
-
- @classmethod
- def poll(cls, context):
- return (context.engine in cls.COMPAT_ENGINES)
-
- def draw_header(self, context):
- scene = context.scene
- scene_props = scene.layer_properties['BLENDER_EEVEE']
- layer = bpy.context.view_layer
- layer_props = layer.engine_overrides['BLENDER_EEVEE']
-
- self.layout.template_override_property(layer_props, scene_props, "volumetric_enable", text="")
-
- def draw(self, context):
- layout = self.layout
- scene = context.scene
- scene_props = scene.layer_properties['BLENDER_EEVEE']
- layer = bpy.context.view_layer
- layer_props = layer.engine_overrides['BLENDER_EEVEE']
-
- col = layout.column()
- col.template_override_property(layer_props, scene_props, "volumetric_start")
- col.template_override_property(layer_props, scene_props, "volumetric_end")
- col.template_override_property(layer_props, scene_props, "volumetric_tile_size")
- col.template_override_property(layer_props, scene_props, "volumetric_samples")
- col.template_override_property(layer_props, scene_props, "volumetric_sample_distribution")
- col.template_override_property(layer_props, scene_props, "volumetric_lights")
- col.template_override_property(layer_props, scene_props, "volumetric_light_clamp")
- col.template_override_property(layer_props, scene_props, "volumetric_shadows")
- col.template_override_property(layer_props, scene_props, "volumetric_shadow_samples")
- col.template_override_property(layer_props, scene_props, "volumetric_colored_transmittance")
-
-
-class VIEWLAYER_PT_eevee_subsurface_scattering(ViewLayerButtonsPanel, Panel):
- bl_label = "Subsurface Scattering"
- bl_options = {'DEFAULT_CLOSED'}
- COMPAT_ENGINES = {'BLENDER_EEVEE'}
-
- @classmethod
- def poll(cls, context):
- return (context.engine in cls.COMPAT_ENGINES)
-
- def draw_header(self, context):
- scene = cont
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list