Commit: b77c6a859ec62139e079003b0ac2a4458620d521 Author: Nick Wu Date: Wed Oct 31 13:45:08 2018 +0800 Branches: soc-2018-npr https://developer.blender.org/rBb77c6a859ec62139e079003b0ac2a4458620d521
Merge remote-tracking branch 'remotes/origin/blender2.8' into soc-2018-npr # Conflicts: # release/scripts/addons # release/scripts/addons_contrib # source/blender/makesdna/DNA_scene_types.h # source/tools =================================================================== =================================================================== diff --cc source/blender/makesdna/DNA_scene_types.h index c38e2b1d629,9045fb4353d..27d499a5cba --- a/source/blender/makesdna/DNA_scene_types.h +++ b/source/blender/makesdna/DNA_scene_types.h @@@ -2236,26 -2171,27 +2236,27 @@@ typedef enum eGPencil_Selectmode_types /* SceneEEVEE->flag */ enum { - SCE_EEVEE_VOLUMETRIC_ENABLED = (1 << 0), - SCE_EEVEE_VOLUMETRIC_LIGHTS = (1 << 1), - SCE_EEVEE_VOLUMETRIC_SHADOWS = (1 << 2), + SCE_EEVEE_VOLUMETRIC_ENABLED = (1 << 0), + SCE_EEVEE_VOLUMETRIC_LIGHTS = (1 << 1), + SCE_EEVEE_VOLUMETRIC_SHADOWS = (1 << 2), // SCE_EEVEE_VOLUMETRIC_COLORED = (1 << 3), /* Unused */ - SCE_EEVEE_GTAO_ENABLED = (1 << 4), - SCE_EEVEE_GTAO_BENT_NORMALS = (1 << 5), - SCE_EEVEE_GTAO_BOUNCE = (1 << 6), - SCE_EEVEE_DOF_ENABLED = (1 << 7), - SCE_EEVEE_BLOOM_ENABLED = (1 << 8), - SCE_EEVEE_MOTION_BLUR_ENABLED = (1 << 9), - SCE_EEVEE_SHADOW_HIGH_BITDEPTH = (1 << 10), - SCE_EEVEE_TAA_REPROJECTION = (1 << 11), - SCE_EEVEE_SSS_ENABLED = (1 << 12), - SCE_EEVEE_SSS_SEPARATE_ALBEDO = (1 << 13), - SCE_EEVEE_SSR_ENABLED = (1 << 14), - SCE_EEVEE_SSR_REFRACTION = (1 << 15), - SCE_EEVEE_SSR_HALF_RESOLUTION = (1 << 16), - SCE_EEVEE_SHOW_IRRADIANCE = (1 << 17), - SCE_EEVEE_SHOW_CUBEMAPS = (1 << 18), - SCE_EEVEE_GI_AUTOBAKE = (1 << 19), + SCE_EEVEE_GTAO_ENABLED = (1 << 4), + SCE_EEVEE_GTAO_BENT_NORMALS = (1 << 5), + SCE_EEVEE_GTAO_BOUNCE = (1 << 6), + SCE_EEVEE_DOF_ENABLED = (1 << 7), + SCE_EEVEE_BLOOM_ENABLED = (1 << 8), + SCE_EEVEE_MOTION_BLUR_ENABLED = (1 << 9), + SCE_EEVEE_SHADOW_HIGH_BITDEPTH = (1 << 10), + SCE_EEVEE_TAA_REPROJECTION = (1 << 11), + SCE_EEVEE_SSS_ENABLED = (1 << 12), + SCE_EEVEE_SSS_SEPARATE_ALBEDO = (1 << 13), + SCE_EEVEE_SSR_ENABLED = (1 << 14), + SCE_EEVEE_SSR_REFRACTION = (1 << 15), + SCE_EEVEE_SSR_HALF_RESOLUTION = (1 << 16), + SCE_EEVEE_SHOW_IRRADIANCE = (1 << 17), + SCE_EEVEE_SHOW_CUBEMAPS = (1 << 18), + SCE_EEVEE_GI_AUTOBAKE = (1 << 19), + SCE_EEVEE_SHADOW_SOFT = (1 << 20), }; /* SceneEEVEE->shadow_method */ diff --cc source/blender/makesrna/RNA_access.h index 66eb3c65feb,ad193eecbe8..853bb3e58c4 --- a/source/blender/makesrna/RNA_access.h +++ b/source/blender/makesrna/RNA_access.h @@@ -495,15 -508,13 +509,14 @@@ extern StructRNA RNA_RenderLayer extern StructRNA RNA_RenderPass; extern StructRNA RNA_RenderResult; extern StructRNA RNA_RenderSettings; - extern StructRNA RNA_RenderEngineSettings; - extern StructRNA RNA_RenderEngineSettingsClay; - extern StructRNA RNA_RigidBodyWorld; - extern StructRNA RNA_RigidBodyObject; extern StructRNA RNA_RigidBodyJointConstraint; + extern StructRNA RNA_RigidBodyObject; + extern StructRNA RNA_RigidBodyWorld; extern StructRNA RNA_SPHFluidSettings; extern StructRNA RNA_Scene; + extern StructRNA RNA_SceneDisplay; extern StructRNA RNA_SceneEEVEE; +extern StructRNA RNA_SceneLANPR; extern StructRNA RNA_SceneObjects; extern StructRNA RNA_SceneRenderLayer; extern StructRNA RNA_SceneSequence; diff --cc source/blender/makesrna/intern/rna_scene.c index f0b03c6fae0,46f29267929..8f10b28ea8a --- a/source/blender/makesrna/intern/rna_scene.c +++ b/source/blender/makesrna/intern/rna_scene.c @@@ -6072,264 -6010,14 +6068,270 @@@ static void rna_def_scene_eevee(Blender RNA_def_property_boolean_default(prop, 0); RNA_def_property_ui_text(prop, "High Bitdepth", "Use 32bit shadows"); RNA_def_property_override_flag(prop, PROPOVERRIDE_OVERRIDABLE_STATIC); + + prop = RNA_def_property(srna, "use_soft_shadows", PROP_BOOLEAN, PROP_NONE); + RNA_def_property_boolean_sdna(prop, NULL, "flag", SCE_EEVEE_SHADOW_SOFT); + RNA_def_property_boolean_default(prop, 0); + RNA_def_property_ui_text(prop, "Soft Shadows", "Randomize shadowmaps origin to create soft shadows"); + RNA_def_property_override_flag(prop, PROPOVERRIDE_OVERRIDABLE_STATIC); } +static void rna_def_scene_lanpr(BlenderRNA *brna) +{ + StructRNA *srna; + PropertyRNA *prop; + + static const EnumPropertyItem DEBUG_rna_enum_lanpr_reload[] = { + {0, "IDLE", 0, "Idle", "Idle"}, + {1, "RELOAD", 0, "RELOAD", "Force reload the scene"}, + {0, NULL, 0, NULL, NULL} + }; + + static const EnumPropertyItem rna_enum_lanpr_master_mode[] = { + {LANPR_MASTER_MODE_SOFTWARE, "SOFTWARE", 0, "Software", "Software edge calculation" }, + {LANPR_MASTER_MODE_DPIX, "DPIX", 0, "DPIX", "DPIX GPU edge calculation"}, + {LANPR_MASTER_MODE_SNAKE, "SNAKE", 0, "Snake", "Image filter and GPU tracing method"}, + {0, NULL, 0, NULL, NULL} + }; + + static const EnumPropertyItem rna_enum_lanpr_enable_post_processing[] = { + {LANPR_POST_PROCESSING_DISABLED, "DISABLED", 0, "Disabled", "LANPR does not compute anything"}, + {LANPR_POST_PROCESSING_ENABLED, "ENABLED", 0, "Enabled", "LANPR will compute feature lines in image post processing"}, + {0, NULL, 0, NULL, NULL} + }; + + static const EnumPropertyItem rna_enum_lanpr_display_thinning_result[] = { + {LANPR_POST_PROCESSING_DISABLED, "DISABLED", 0, "Edge Detection", "Display edge detector result"}, + {LANPR_POST_PROCESSING_ENABLED, "ENABLED", 0, "Thinning", "Apply thinning filters for vector usage"}, + {0, NULL, 0, NULL, NULL} + }; + + static const EnumPropertyItem rna_enum_lanpr_use_same_taper[] = { + {LANPR_USE_DIFFERENT_TAPER, "DISABLED", 0, "Different", "Use different taper value"}, + {LANPR_USE_SAME_TAPER, "ENABLED", 0, "Same", "Use same taper value for both sides of the line"}, + {0, NULL, 0, NULL, NULL} + }; + + static const EnumPropertyItem rna_enum_lanpr_enable_tip_extend[] = { + {LANPR_DISABLE_TIP_EXTEND, "DISABLED", 0, "Disable", "Do not extend curve tips"}, + {LANPR_ENABLE_TIP_EXTEND, "ENABLED", 0, "Enable", "Extend curve tips to a user specified length"}, + {0, NULL, 0, NULL, NULL} + }; + + srna = RNA_def_struct(brna, "SceneLANPR", NULL); + RNA_def_struct_sdna(srna, "SceneLANPR"); + RNA_def_struct_ui_text(srna, "Scene LANPR Config", "LANPR global config"); + + + prop = RNA_def_property(srna, "reloaded", PROP_ENUM, PROP_NONE); + RNA_def_property_enum_items(prop, DEBUG_rna_enum_lanpr_reload); + RNA_def_property_enum_default(prop, 0); + RNA_def_property_ui_text(prop, "Reload", "Reload the scene"); + RNA_def_property_flag(prop, PROP_EDITABLE); + RNA_def_property_update(prop, NC_SCENE, NULL); + + + prop = RNA_def_property(srna, "master_mode", PROP_ENUM, PROP_NONE); + RNA_def_property_enum_items(prop, rna_enum_lanpr_master_mode); + RNA_def_property_enum_default(prop, LANPR_MASTER_MODE_DPIX); + RNA_def_property_ui_text(prop, "Master Mode", "Choose calculation mode for NPR Line"); + RNA_def_property_flag(prop, PROP_EDITABLE); + RNA_def_property_update(prop, NC_SCENE, NULL); + + prop = RNA_def_property(srna, "enable_vector_trace", PROP_ENUM, PROP_NONE); + RNA_def_property_enum_items(prop, rna_enum_lanpr_enable_post_processing); + RNA_def_property_enum_default(prop, LANPR_POST_PROCESSING_DISABLED); + RNA_def_property_ui_text(prop, "Enable Post Processing", "Draw image post processing line or not"); + RNA_def_property_flag(prop, PROP_EDITABLE); + RNA_def_property_update(prop, NC_SCENE, NULL); + + prop = RNA_def_property(srna, "display_thinning_result", PROP_ENUM, PROP_NONE); + RNA_def_property_enum_items(prop, rna_enum_lanpr_display_thinning_result); + RNA_def_property_enum_default(prop, LANPR_POST_PROCESSING_DISABLED); + RNA_def_property_ui_text(prop, "Display", "Display mode"); + RNA_def_property_flag(prop, PROP_EDITABLE); + RNA_def_property_update(prop, NC_SCENE, NULL); + + prop = RNA_def_property(srna, "depth_clamp", PROP_FLOAT, PROP_PERCENTAGE); + RNA_def_property_float_default(prop, 0.001f); + RNA_def_property_ui_text(prop, "Depth Clamp", "Depth clamp value for edge extraction"); + RNA_def_property_ui_range(prop, 0.0, 0.01, 0.0001, 5); + RNA_def_property_flag(prop, PROP_EDITABLE); + RNA_def_property_update(prop, NC_SCENE, NULL); + + prop = RNA_def_property(srna, "depth_strength", PROP_FLOAT, PROP_PERCENTAGE); + RNA_def_property_float_default(prop, 800); + RNA_def_property_ui_text(prop, "Depth Strength", "Depth strength value for edge extraction"); + RNA_def_property_ui_range(prop, 0, 1000, 10, 2); + RNA_def_property_flag(prop, PROP_EDITABLE); + RNA_def_property_update(prop, NC_SCENE, NULL); + + prop = RNA_def_property(srna, "normal_clamp", PROP_FLOAT, PROP_PERCENTAGE); + RNA_def_property_float_default(prop, 2); + RNA_def_property_ui_text(prop, "Normal Clamp", "Normal clamp value for edge extraction"); + RNA_def_property_ui_range(prop, 0, 5, 0.1, 2); + RNA_def_property_flag(prop, PROP_EDITABLE); + RNA_def_property_update(prop, NC_SCENE, NULL); + + prop = RNA_def_property(srna, "normal_strength", PROP_FLOAT, PROP_PERCENTAGE); + RNA_def_property_float_default(prop, 10); + RNA_def_property_ui_text(prop, "Normal Strength", "Normal strength value for edge extraction"); + RNA_def_property_ui_range(prop, 0, 20, 1, 2); + RNA_def_property_flag(prop, PROP_EDITABLE); + RNA_def_property_update(prop, NC_SCENE, NULL); + + prop = RNA_def_property(srna, "line_thickness", PROP_FLOAT, PROP_NONE); + RNA_def_property_float_default(prop, 2.0f); + RNA_def_property_ui_text(prop, "Line Thickness", "Thickness of extracted line"); + RNA_def_property_ui_range(prop, 0.01f, 10.0f, 0.1, 2); + RNA_def_property_flag(prop, PROP_EDITABLE); + RNA_def_property_update(prop, NC_SCENE, NULL); + + prop = RNA_def_property(srna, "depth_width_influence", PROP_FLOAT, PROP_PERCENTAGE); + RNA_def_property_float_default(prop, 0.3f); + RNA_def_property_ui_text(prop, "Width Influence", "Use camera distance to control line width."); + RNA_def_property_ui_range(prop, 0.0f, 1.0f, 0.05, 2); + RNA_def_property_flag(prop, PROP_EDITABLE); + RNA_def_property_update(prop, NC_SCENE, NULL); + + prop = RNA_def_property(srna, "depth_width_curve", PROP_FLOAT, PROP_NONE); + RNA_def_property_float_default(prop, 0.3f); + RNA_def_property_ui_text(prop, "Width Curve", "Width curve"); + RNA_def_property_ui_range(prop, -5.0f, 0.90f, 0.1, 1); + RNA_def_property_flag(prop, PROP_EDITABLE); + RNA_def_property_update(prop, NC_SCENE, NULL); + + prop = RNA_def @@ Diff output truncated at 10240 characters. @@ _______________________________________________ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org https://lists.blender.org/mailman/listinfo/bf-blender-cvs