[Bf-blender-cvs] [915a928067a] soc-2019-npr: Merge branch 'master' into soc-2019-npr
YimingWu
noreply at git.blender.org
Mon Jun 17 09:10:57 CEST 2019
Commit: 915a928067a89923fab144ca4a7ca2e75337a5e8
Author: YimingWu
Date: Mon Jun 17 14:58:39 2019 +0800
Branches: soc-2019-npr
https://developer.blender.org/rB915a928067a89923fab144ca4a7ca2e75337a5e8
Merge branch 'master' into soc-2019-npr
===================================================================
===================================================================
diff --cc source/blender/makesrna/intern/rna_scene.c
index a126b880ea4,408282c5201..86ca1e21bb3
--- a/source/blender/makesrna/intern/rna_scene.c
+++ b/source/blender/makesrna/intern/rna_scene.c
@@@ -7123,290 -7071,9 +7123,290 @@@ static void rna_def_scene_eevee(Blender
"internal render buffers");
RNA_def_property_range(prop, 0.0f, 50.0f);
RNA_def_property_ui_range(prop, 0.0f, 10.0f, 1, 2);
- RNA_def_property_override_flag(prop, PROPOVERRIDE_OVERRIDABLE_STATIC);
+ RNA_def_property_override_flag(prop, PROPOVERRIDE_OVERRIDABLE_LIBRARY);
}
+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_property(srna, "depth_alpha_influence", PROP_FLOAT, PROP_PERCENTAGE);
+ RNA_def_property_float_default(prop, 0.3f);
+ RNA_def_property_ui_text(prop, "Alpha Influence", "Use camera distance to control line alpha.");
+ 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_alpha_curve", PROP_FLOAT, PROP_NONE);
+ RNA_def_property_float_default(prop, 0.3f);
+ RNA_def_property_ui_text(prop, "Alpha Curve", "alpha 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_property(srna, "taper_left_distance", PROP_FLOAT, PROP_NONE);
+ RNA_def_property_float_default(prop, 20.0f);
+ RNA_def_property_ui_text(prop, "Distance Left", "Left side taper distance");
+ RNA_def_property_ui_range(prop, 0.0f, 100.0f, 0.1, 2);
+ RNA_def_property_flag(prop, PROP_EDITABLE);
+ RNA_def_property_update(prop, NC_SCENE, NULL);
+
+ prop = RNA_def_property(srna, "taper_right_distance", PROP_FLOAT, PROP_NONE);
+ RNA_def_property_float_default(prop, 20.0f);
+ RNA_def_property_ui_text(prop, "Distance right", "Right side taper distance");
+ RNA_def_property_ui_range(prop, 0.0f, 100.0f, 0.1, 2);
+ RNA_def_property_flag(prop, PROP_EDITABLE);
+ RNA_def_property_update(prop, NC_SCENE, NULL);
+
+ prop = RNA_def_property(srna, "taper_left_strength", PROP_FLOAT, PROP_FACTOR);
+ RNA_def_property_float_default(prop, 1.0f);
+ RNA_def_property_ui_text(prop, "Strength left", "Left side taper strength");
+ RNA_def_property_ui_range(prop, 0.0f, 1.0f, 0.1, 2);
+ RNA_def_property_flag(prop, PROP_EDITABLE);
+ RNA_def_property_update(prop, NC_SCENE, NULL);
+
+ prop = RNA_def_property(srna, "taper_right_strength", PROP_FLOAT, PROP_FACTOR);
+ RNA_def_property_float_default(prop, 1.0f);
+ RNA_def_property_ui_text(prop, "Strength right", "Right side taper strength");
+ RNA_def_property_ui_range(prop, 0.0f, 1.0f, 0.1, 2);
+ RNA_def_property_flag(prop, PROP_EDITABLE);
+ RNA_def_property_update(prop, NC_SCENE, NULL);
+
+ prop = RNA_def_property(srna, "use_same_taper", PROP_ENUM, PROP_NONE);
+ RNA_def_property_enum_items(prop, rna_enum_lanpr_use_same_taper);
+ RNA_def_property_enum_default(prop, LANPR_USE_DIFFERENT_TAPER);
+ RNA_def_property_ui_text(prop, "Taper", "Same/Different taper value");
+ RNA_def_property_flag(prop, PROP_EDITABLE);
+ RNA_def_property_update(prop, NC_SCENE, NULL);
+
+ prop = RNA_def_property(srna, "line_color", PROP_FLOAT, PROP_COLOR);
+ RNA_def_property_float_default(prop, 1.0f);
+ RNA_def_property_array(prop, 4);
+ RNA_def_property_ui_text(prop, "Line Color", "Drawing lines using this color");
+ RNA_def_property_ui_range(prop, 0.0f, 1.0f, 0.1, 2);
+ RNA_def_property_flag(prop, PROP_EDITABLE);
+ RNA_def_property_update(prop, NC_SCENE, NULL);
+
+ pr
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list