[Bf-blender-cvs] [b6b1e0f56ce] blender2.8: T55454: removal of clay engine

Jeroen Bakker noreply at git.blender.org
Tue Jun 12 15:33:37 CEST 2018 

Commit: b6b1e0f56cefc43571c8fc09bb14e4cb4bff7841
Author: Jeroen Bakker
Date:   Tue Jun 12 15:15:36 2018 +0200
Branches: blender2.8
https://developer.blender.org/rBb6b1e0f56cefc43571c8fc09bb14e4cb4bff7841

T55454: removal of clay engine

The ClayEngine was introduced to test the blender2.8 architecture during
development. As currently we have the wanted features implemented with
matcaps we are going to remove the clay engine as it was never intended
to be an official releasable engine

Note: The test cases are never run. But when enabled will be skipped as
they were implemented over the Clay Engine

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

M	CMakeLists.txt
D	release/datafiles/matcaps/license.txt
D	release/datafiles/matcaps/mc01.jpg
D	release/datafiles/matcaps/mc02.jpg
D	release/datafiles/matcaps/mc03.jpg
D	release/datafiles/matcaps/mc04.jpg
D	release/datafiles/matcaps/mc05.jpg
D	release/datafiles/matcaps/mc06.jpg
D	release/datafiles/matcaps/mc07.jpg
D	release/datafiles/matcaps/mc08.jpg
D	release/datafiles/matcaps/mc09.jpg
D	release/datafiles/matcaps/mc10.jpg
D	release/datafiles/matcaps/mc11.jpg
D	release/datafiles/matcaps/mc12.jpg
D	release/datafiles/matcaps/mc13.jpg
D	release/datafiles/matcaps/mc14.jpg
D	release/datafiles/matcaps/mc15.jpg
D	release/datafiles/matcaps/mc16.jpg
D	release/datafiles/matcaps/mc17.jpg
D	release/datafiles/matcaps/mc18.jpg
D	release/datafiles/matcaps/mc19.jpg
D	release/datafiles/matcaps/mc20.jpg
D	release/datafiles/matcaps/mc21.jpg
D	release/datafiles/matcaps/mc22.jpg
D	release/datafiles/matcaps/mc23.jpg
D	release/datafiles/matcaps/mc24.jpg
M	release/scripts/startup/bl_ui/properties_data_armature.py
M	release/scripts/startup/bl_ui/properties_data_bone.py
M	release/scripts/startup/bl_ui/properties_data_camera.py
M	release/scripts/startup/bl_ui/properties_data_curve.py
M	release/scripts/startup/bl_ui/properties_data_lamp.py
M	release/scripts/startup/bl_ui/properties_data_lattice.py
M	release/scripts/startup/bl_ui/properties_data_lightprobe.py
M	release/scripts/startup/bl_ui/properties_data_mesh.py
M	release/scripts/startup/bl_ui/properties_data_metaball.py
M	release/scripts/startup/bl_ui/properties_data_speaker.py
M	release/scripts/startup/bl_ui/properties_object.py
M	release/scripts/startup/bl_ui/properties_particle.py
M	release/scripts/startup/bl_ui/properties_physics_field.py
M	release/scripts/startup/bl_ui/properties_render.py
M	release/scripts/startup/bl_ui/properties_scene.py
M	release/scripts/startup/bl_ui/properties_view_layer.py
M	source/blender/blenkernel/intern/scene.c
M	source/blender/blenloader/CMakeLists.txt
M	source/blender/blenloader/intern/versioning_280.c
M	source/blender/draw/CMakeLists.txt
D	source/blender/draw/engines/clay/clay_engine.c
D	source/blender/draw/engines/clay/clay_engine.h
D	source/blender/draw/engines/clay/shaders/clay_copy.glsl
D	source/blender/draw/engines/clay/shaders/clay_frag.glsl
D	source/blender/draw/engines/clay/shaders/clay_fxaa.glsl
D	source/blender/draw/engines/clay/shaders/clay_particle_strand_frag.glsl
D	source/blender/draw/engines/clay/shaders/clay_particle_vert.glsl
D	source/blender/draw/engines/clay/shaders/clay_prepass_frag.glsl
D	source/blender/draw/engines/clay/shaders/clay_vert.glsl
D	source/blender/draw/engines/clay/shaders/ssao_alchemy.glsl
D	source/blender/draw/engines/clay/shaders/ssao_groundtruth.glsl
M	source/blender/draw/intern/draw_manager.c
M	source/blender/editors/datafiles/CMakeLists.txt
M	source/blender/editors/interface/interface_icons.c
M	source/blender/makesdna/DNA_material_types.h
M	source/blender/makesdna/DNA_scene_types.h
M	source/blender/makesrna/intern/CMakeLists.txt
M	source/blender/makesrna/intern/rna_scene.c
M	tests/python/view_layer/test_evaluation_render_settings_a.py
M	tests/python/view_layer/test_evaluation_render_settings_b.py
M	tests/python/view_layer/test_evaluation_render_settings_c.py
M	tests/python/view_layer/test_evaluation_render_settings_d.py
M	tests/python/view_layer/test_evaluation_render_settings_e.py
M	tests/python/view_layer/test_evaluation_render_settings_f.py
M	tests/python/view_layer/test_evaluation_render_settings_g.py
M	tests/python/view_layer/test_evaluation_render_settings_h.py
M	tests/python/view_layer/test_evaluation_render_settings_i.py

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

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5f1b9b1643c..4a537a01545 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -227,8 +227,6 @@ option(WITH_SYSTEM_BULLET "Use the systems bullet library (currently unsupported
 mark_as_advanced(WITH_SYSTEM_BULLET)
 option(WITH_OPENCOLORIO   "Enable OpenColorIO color management" ${_init_OPENCOLORIO})
 
-option(WITH_CLAY_ENGINE    "Enable Clay engine" ON)
-
 # Compositor
 option(WITH_COMPOSITOR         "Enable the tile based nodal compositor" ON)
 
diff --git a/release/datafiles/matcaps/license.txt b/release/datafiles/matcaps/license.txt
deleted file mode 100644
index 358c8dcd832..00000000000
--- a/release/datafiles/matcaps/license.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-These matcap images are licensed as GNU GPL 2 or later, like the rest of Blender's code.
-
-Thanks to Kent Trammell, Aidy Burrows, John Herreno , Terry Wallwork and David Silverman for making the pictures.
diff --git a/release/datafiles/matcaps/mc01.jpg b/release/datafiles/matcaps/mc01.jpg
deleted file mode 100644
index 8c7aef287ee..00000000000
Binary files a/release/datafiles/matcaps/mc01.jpg and /dev/null differ
diff --git a/release/datafiles/matcaps/mc02.jpg b/release/datafiles/matcaps/mc02.jpg
deleted file mode 100644
index 11deddfeaed..00000000000
Binary files a/release/datafiles/matcaps/mc02.jpg and /dev/null differ
diff --git a/release/datafiles/matcaps/mc03.jpg b/release/datafiles/matcaps/mc03.jpg
deleted file mode 100644
index 64d992fb61a..00000000000
Binary files a/release/datafiles/matcaps/mc03.jpg and /dev/null differ
diff --git a/release/datafiles/matcaps/mc04.jpg b/release/datafiles/matcaps/mc04.jpg
deleted file mode 100644
index 42be580ee93..00000000000
Binary files a/release/datafiles/matcaps/mc04.jpg and /dev/null differ
diff --git a/release/datafiles/matcaps/mc05.jpg b/release/datafiles/matcaps/mc05.jpg
deleted file mode 100644
index 586d233ef31..00000000000
Binary files a/release/datafiles/matcaps/mc05.jpg and /dev/null differ
diff --git a/release/datafiles/matcaps/mc06.jpg b/release/datafiles/matcaps/mc06.jpg
deleted file mode 100644
index 657883d0866..00000000000
Binary files a/release/datafiles/matcaps/mc06.jpg and /dev/null differ
diff --git a/release/datafiles/matcaps/mc07.jpg b/release/datafiles/matcaps/mc07.jpg
deleted file mode 100644
index 372caf7e87c..00000000000
Binary files a/release/datafiles/matcaps/mc07.jpg and /dev/null differ
diff --git a/release/datafiles/matcaps/mc08.jpg b/release/datafiles/matcaps/mc08.jpg
deleted file mode 100644
index 50eec402812..00000000000
Binary files a/release/datafiles/matcaps/mc08.jpg and /dev/null differ
diff --git a/release/datafiles/matcaps/mc09.jpg b/release/datafiles/matcaps/mc09.jpg
deleted file mode 100644
index e05d441aaf9..00000000000
Binary files a/release/datafiles/matcaps/mc09.jpg and /dev/null differ
diff --git a/release/datafiles/matcaps/mc10.jpg b/release/datafiles/matcaps/mc10.jpg
deleted file mode 100644
index ab82f17bb93..00000000000
Binary files a/release/datafiles/matcaps/mc10.jpg and /dev/null differ
diff --git a/release/datafiles/matcaps/mc11.jpg b/release/datafiles/matcaps/mc11.jpg
deleted file mode 100644
index 053550f082c..00000000000
Binary files a/release/datafiles/matcaps/mc11.jpg and /dev/null differ
diff --git a/release/datafiles/matcaps/mc12.jpg b/release/datafiles/matcaps/mc12.jpg
deleted file mode 100644
index beb16f3742e..00000000000
Binary files a/release/datafiles/matcaps/mc12.jpg and /dev/null differ
diff --git a/release/datafiles/matcaps/mc13.jpg b/release/datafiles/matcaps/mc13.jpg
deleted file mode 100644
index 7fb8fa58e8f..00000000000
Binary files a/release/datafiles/matcaps/mc13.jpg and /dev/null differ
diff --git a/release/datafiles/matcaps/mc14.jpg b/release/datafiles/matcaps/mc14.jpg
deleted file mode 100644
index ba868d2f95a..00000000000
Binary files a/release/datafiles/matcaps/mc14.jpg and /dev/null differ
diff --git a/release/datafiles/matcaps/mc15.jpg b/release/datafiles/matcaps/mc15.jpg
deleted file mode 100644
index b10ea326a42..00000000000
Binary files a/release/datafiles/matcaps/mc15.jpg and /dev/null differ
diff --git a/release/datafiles/matcaps/mc16.jpg b/release/datafiles/matcaps/mc16.jpg
deleted file mode 100644
index c6ce02d59df..00000000000
Binary files a/release/datafiles/matcaps/mc16.jpg and /dev/null differ
diff --git a/release/datafiles/matcaps/mc17.jpg b/release/datafiles/matcaps/mc17.jpg
deleted file mode 100644
index 14f15f70460..00000000000
Binary files a/release/datafiles/matcaps/mc17.jpg and /dev/null differ
diff --git a/release/datafiles/matcaps/mc18.jpg b/release/datafiles/matcaps/mc18.jpg
deleted file mode 100644
index db572856b07..00000000000
Binary files a/release/datafiles/matcaps/mc18.jpg and /dev/null differ
diff --git a/release/datafiles/matcaps/mc19.jpg b/release/datafiles/matcaps/mc19.jpg
deleted file mode 100644
index 56d2efb1734..00000000000
Binary files a/release/datafiles/matcaps/mc19.jpg and /dev/null differ
diff --git a/release/datafiles/matcaps/mc20.jpg b/release/datafiles/matcaps/mc20.jpg
deleted file mode 100644
index 002a0910dd9..00000000000
Binary files a/release/datafiles/matcaps/mc20.jpg and /dev/null differ
diff --git a/release/datafiles/matcaps/mc21.jpg b/release/datafiles/matcaps/mc21.jpg
deleted file mode 100644
index cb2fea573b8..00000000000
Binary files a/release/datafiles/matcaps/mc21.jpg and /dev/null differ
diff --git a/release/datafiles/matcaps/mc22.jpg b/release/datafiles/matcaps/mc22.jpg
deleted file mode 100644
index 2fc71b98c5a..00000000000
Binary files a/release/datafiles/matcaps/mc22.jpg and /dev/null differ
diff --git a/release/datafiles/matcaps/mc23.jpg b/release/datafiles/matcaps/mc23.jpg
deleted file mode 100644
index 3793c0fcaa5..00000000000
Binary files a/release/datafiles/matcaps/mc23.jpg and /dev/null differ
diff --git a/release/datafiles/matcaps/mc24.jpg b/release/datafiles/matcaps/mc24.jpg
deleted file mode 100644
index 2a9618d8fe1..00000000000
Binary files a/release/datafiles/matcaps/mc24.jpg and /dev/null differ
diff --git a/release/scripts/startup/bl_ui/properties_data_armature.py b/release/scripts/startup/bl_ui/properties_data_armature.py
index e58b4f56ffe..6cfc4b6ea3f 100644
--- a/release/scripts/startup/bl_ui/properties_data_armature.py
+++ b/release/scripts/startup/bl_ui/properties_data_armature.py
@@ -328,7 +328,7 @@ class DATA_PT_onion_skinning(OnionSkinButtonsPanel):  # , Panel): # inherit from
 
 
 class DATA_PT_custom_props_arm(ArmatureButtonsPanel, PropertyPanel, Panel):
-    COMPAT_ENGINES = {'BLENDER_RENDER', 'BLENDER_CLAY', 'BLENDER_EEVEE'}
+    COMPAT_ENGINES = {'BLENDER_RENDER', 'BLENDER_EEVEE'}
     _context_path = "object.data"
     _property_type = bpy.types.Armature
 
diff --git a/release/scripts/startup/bl_ui/properties_data_bone.py b/release/scripts/startup/bl_ui/properties_data_bone.py
index 079669dbd02..cc593fbb0a2 100644
--- a/release/scripts/startup/bl_ui/properties_data_bone.py
+++ b/release/scripts/startup/bl_ui/properties_data_bone.py
@@ -402,7 +402,7 @@ class BONE_PT_deform(BoneButtonsPanel, Panel):
 
 
 class BONE_PT_custom_props(BoneButtonsPanel, PropertyPanel, Panel):
-    COMPAT_ENGINES = {'BLENDER_RENDER', 'BLENDER_CLAY', 'BLENDER_EEVEE'}
+    COMPAT_ENGINES = {'BLENDER_RENDER', 'BLENDER_EEVEE'}
     _property_type = bpy.types.Bone, bpy.types.EditBone, bpy.types.PoseBone
 
     @property
diff --git a/release/scripts/startup/bl_ui/properties_data_camera.py b/release/scripts/startup/bl_ui/properties_data_camera.py
index e81fc393af8..132a226f287 100644
--- a/release/scripts/startup/bl_ui/properties_data_camera.py
+++ b/release/scripts/startup/bl_ui/properties_data_camera.py
@@ -37,7 +37,7 @@ class CAMERA_MT_presets(Menu):
     bl_label = "Camera Presets"
     preset_subdir = "camera"
     preset_operator = "script.execute_preset"
-    COMPAT_ENGINES = {'BLENDER_RENDER', 'BLENDER_CLAY', 'BLENDER_EEVEE'}
+    COMPAT_ENGINES = {'BLENDER_RENDER', 'BLENDER_EEVEE'}
     draw = Menu.draw_preset
 
 
@@ -45,14 +45,14 @@ class SAFE_AREAS_MT_presets(Menu):
     bl_label = "Camera Presets"
     preset_subdir = "safe_areas"
     preset_operator = "script.execute_preset"
-    COMPAT_ENGINES = {'BLENDER_RENDER', 'BLENDER_CLAY', 'BLENDER_EEVEE'}
+    COMPAT_ENGINES = {'BLENDER_RENDER', 'BLENDER_EEVEE'}
     draw = Menu.draw_preset
 
 
 class DATA_PT_context_camera(CameraButtonsPanel, Panel):
     bl_label = ""
     bl_options = {'HIDE_HEADER'}
-    COMPAT_ENGINES = {'BLENDER_RENDER', 'BLENDER_CLAY', 'BLENDER_EEVEE'}
+    COMPAT_ENGINES = {'BLENDER_RENDER', 'BLENDER_EEVEE'}
 
     def draw(self, context):
         layout = self.layout
@@ -72,7 +72,7 @@ class DATA_PT_context_camera(CameraButtonsPanel, Panel):
 
 class DATA_PT_lens(CameraButtonsPanel, Panel):
     bl_label = "Lens"
-    COMPAT_ENGINES = {'BLENDER_RENDER', 'BLENDER_CLAY', 'BLENDER_EEVEE'}
+    COMPAT_ENGINES = {'BLENDER_RENDER', 'BLENDER_EEVEE'}
 
     def draw(self, context):
         layout = self.layout
@@ -113,7 +113,7 @@ class DATA_PT_lens(CameraButtonsPanel, Panel):
                     sub = col.column(align=True)
                     sub.prop(ccam, "longitude_min", text="Longiture Min")
                     sub.prop(ccam, "longitude_max", text="Max")
-            elif engine in {'BLENDER_RENDER', 'BLENDER_CLAY', 'BLENDER_EEVEE'}:
+            elif engine in {'BLENDER_RENDER', 'BLENDER_EEVEE'}:
                 if cam.lens_unit == 'MILLIMETERS':
                     col.prop(cam, "lens")
                 elif cam.lens_unit == 'FOV':
@@ -135,7 +135,7 @@ class DATA_PT_lens(CameraButtonsPanel, Panel):
 
 class DATA_PT_camera_stereoscopy(CameraButtonsPanel, Panel):
     bl_label = "Stereoscopy"
-    COMPAT_ENGINES = {'BLENDER_RENDER', 'BLENDER_CLAY', 'BLENDER_EEVEE'}
+    COMPAT_ENGINES = {'BLENDER_RENDER', 'BLENDER_EEVEE'}
 
     @classmethod
     def poll(cls, context):
@@ -183,7 +183,7 @@ class DATA_PT_camera_stereoscopy(CameraButtonsPanel, Panel):
 
 class DATA_PT_camera(CameraButtonsPanel, Panel):
     bl_label = "Camera"
-    COMPAT_ENGINES = {'BLENDER_RENDER', 'BLENDER_CLAY', 'BLENDER_EEVEE'}
+    COMPAT_ENGINES = {'BLENDER_RENDER', 'BLENDER_EEVEE'}
 
     def draw(self, context):
         layout = self.layout
@@ -216,7 +216,7 @@ class DATA_PT_camera(CameraButtonsP

@@ Diff output truncated at 10240 characters. @@

More information about the Bf-blender-cvs mailing list