From c0667c2f35a1be4c56fac21d48b3a19bd460cb8d Mon Sep 17 00:00:00 2001 From: Jeroen Bakker Date: Wed, 9 May 2018 13:30:27 +0200 Subject: T55008: Migrating RE-Collection data to Scene data in Scene DNA is available in scene.display New DNA Struct DisplayData Added RNA (scene.display). We already have scene.display_settings which contains non viewpoert specific color management settings. I did not merge those two. Patch should be in line with the ideas that @brecht wrote in T55008. As I am not in detail aware of the decisions that have been made for the override feature I want a short review if it is in line with the plans. Reviewers: brecht, dfelinto Reviewed By: brecht Subscribers: brecht Tags: #code_quest, #bf_blender_2.8 Differential Revision: https://developer.blender.org/D3290 --- source/blender/makesrna/intern/rna_layer.c | 76 ------------------------------ 1 file changed, 76 deletions(-) (limited to 'source/blender/makesrna/intern/rna_layer.c') diff --git a/source/blender/makesrna/intern/rna_layer.c b/source/blender/makesrna/intern/rna_layer.c index e64f5cf8b3e..cbd93141213 100644 --- a/source/blender/makesrna/intern/rna_layer.c +++ b/source/blender/makesrna/intern/rna_layer.c @@ -302,18 +302,6 @@ static void rna_LayerEngineSettings_##_ENGINE_##_##_NAME_##_set(PointerRNA *ptr, #define RNA_LAYER_ENGINE_EEVEE_GET_SET_BOOL(_NAME_) \ RNA_LAYER_ENGINE_GET_SET(bool, Eevee, _NAME_) -#define RNA_LAYER_ENGINE_WORKBENCH_GET_SET_FLOAT_ARRAY(_NAME_, _LEN_) \ - RNA_LAYER_ENGINE_GET_SET_ARRAY(float, Workbench, _NAME_, _LEN_) - -#define RNA_LAYER_ENGINE_WORKBENCH_GET_SET_FLOAT(_NAME_) \ - RNA_LAYER_ENGINE_GET_SET(float, Workbench, _NAME_) - -#define RNA_LAYER_ENGINE_WORKBENCH_GET_SET_INT(_NAME_) \ - RNA_LAYER_ENGINE_GET_SET(int, Workbench, _NAME_) - -#define RNA_LAYER_ENGINE_WORKBENCH_GET_SET_BOOL(_NAME_) \ - RNA_LAYER_ENGINE_GET_SET(bool, Workbench, _NAME_) - /* clay engine */ #ifdef WITH_CLAY_ENGINE /* ViewLayer settings. */ @@ -332,13 +320,6 @@ RNA_LAYER_ENGINE_CLAY_GET_SET_FLOAT(ssao_attenuation) RNA_LAYER_ENGINE_CLAY_GET_SET_FLOAT(hair_brightness_randomness) #endif /* WITH_CLAY_ENGINE */ -/* workbench engine */ -/* Collection settings */ -RNA_LAYER_ENGINE_WORKBENCH_GET_SET_FLOAT(random_object_color_saturation) -RNA_LAYER_ENGINE_WORKBENCH_GET_SET_FLOAT(random_object_color_value) -/* View Layer settings */ -RNA_LAYER_ENGINE_WORKBENCH_GET_SET_FLOAT_ARRAY(light_direction, 3) - /* eevee engine */ /* ViewLayer settings. */ RNA_LAYER_ENGINE_EEVEE_GET_SET_BOOL(gtao_enable) @@ -470,9 +451,6 @@ static StructRNA *rna_ViewLayerSettings_refine(PointerRNA *ptr) if (STREQ(props->name, RE_engine_id_BLENDER_EEVEE)) { return &RNA_ViewLayerEngineSettingsEevee; } - else if (STREQ(props->name, RE_engine_id_BLENDER_WORKBENCH)) { - return &RNA_ViewLayerEngineSettingsWorkbench; - } break; default: BLI_assert(!"Mode not fully implemented"); @@ -530,9 +508,6 @@ static StructRNA *rna_LayerCollectionSettings_refine(PointerRNA *ptr) return &RNA_LayerCollectionEngineSettingsClay; } #endif - if (STREQ(props->name, RE_engine_id_BLENDER_WORKBENCH)) { - return &RNA_LayerCollectionEngineSettingsWorkbench; - } if (STREQ(props->name, RE_engine_id_BLENDER_EEVEE)) { /* printf("Mode not fully implemented\n"); */ return &RNA_LayerCollectionSettings; @@ -1603,54 +1578,6 @@ static void rna_def_layer_collection_engine_settings_clay(BlenderRNA *brna) } #endif /* WITH_CLAY_ENGINE */ -/* Workbench engine */ -static void rna_def_view_layer_engine_settings_workbench(BlenderRNA *brna) -{ - StructRNA *srna; - PropertyRNA *prop; - - srna = RNA_def_struct(brna, "ViewLayerEngineSettingsWorkbench", "ViewLayerSettings"); - RNA_def_struct_ui_text(srna, "Workbench Scene Layer Settings", "Workbench Engine settings"); - - RNA_define_verify_sdna(0); /* not in sdna */ - prop = RNA_def_property(srna, "light_direction", PROP_FLOAT, PROP_DIRECTION); - RNA_def_property_array(prop, 3); - RNA_def_property_float_funcs(prop, "rna_LayerEngineSettings_Workbench_light_direction_get", "rna_LayerEngineSettings_Workbench_light_direction_set", NULL); - RNA_def_property_ui_text(prop, "Light Direction", "Direction of the light for shadow calculation"); - RNA_def_property_range(prop, 0.0f, 1.0f); - RNA_def_property_flag(prop, PROP_CONTEXT_UPDATE); - RNA_def_property_update(prop, NC_SCENE | ND_LAYER_CONTENT, "rna_ViewLayerEngineSettings_update"); - - RNA_define_verify_sdna(1); /* not in sdna */ -} - -static void rna_def_layer_collection_engine_settings_workbench(BlenderRNA *brna) -{ - StructRNA *srna; - PropertyRNA *prop; - - srna = RNA_def_struct(brna, "LayerCollectionEngineSettingsWorkbench", "LayerCollectionSettings"); - RNA_def_struct_ui_text(srna, "Collections Workbench Engine Settings", "Workbench specific settings for this collection"); - - RNA_define_verify_sdna(0); /* not in sdna */ - - prop = RNA_def_property(srna, "random_object_color_saturation", PROP_FLOAT, PROP_NONE); - RNA_def_property_float_funcs(prop, "rna_LayerEngineSettings_Workbench_random_object_color_saturation_get", "rna_LayerEngineSettings_Workbench_random_object_color_saturation_set", NULL); - RNA_def_property_ui_text(prop, "Random Saturation", "Random Object Color Saturation"); - RNA_def_property_range(prop, 0.0f, 1.0f); - RNA_def_property_flag(prop, PROP_CONTEXT_UPDATE); - RNA_def_property_update(prop, 0, "rna_LayerCollectionEngineSettings_update"); - - prop = RNA_def_property(srna, "random_object_color_value", PROP_FLOAT, PROP_NONE); - RNA_def_property_float_funcs(prop, "rna_LayerEngineSettings_Workbench_random_object_color_value_get", "rna_LayerEngineSettings_Workbench_random_object_color_value_set", NULL); - RNA_def_property_ui_text(prop, "Random Value", "Random Object Color Value"); - RNA_def_property_range(prop, 0.0f, 1.0f); - RNA_def_property_flag(prop, PROP_CONTEXT_UPDATE); - RNA_def_property_update(prop, 0, "rna_LayerCollectionEngineSettings_update"); - - RNA_define_verify_sdna(1); /* not in sdna */ -} - static void rna_def_view_layer_settings(BlenderRNA *brna) { StructRNA *srna; @@ -1687,7 +1614,6 @@ static void rna_def_view_layer_settings(BlenderRNA *brna) #ifdef WITH_CLAY_ENGINE rna_def_view_layer_engine_settings_clay(brna); #endif - rna_def_view_layer_engine_settings_workbench(brna); rna_def_view_layer_engine_settings_eevee(brna); RNA_define_verify_sdna(1); @@ -1730,8 +1656,6 @@ static void rna_def_layer_collection_settings(BlenderRNA *brna) rna_def_layer_collection_engine_settings_clay(brna); #endif - rna_def_layer_collection_engine_settings_workbench(brna); - RNA_define_verify_sdna(1); } -- cgit v1.2.3