[Bf-blender-cvs] [054e889a93e] soc-2018-npr: Merge remote-tracking branch 'remotes/origin/blender2.8' into soc-2018-npr
Nick Wu
noreply at git.blender.org
Thu Jun 7 05:43:31 CEST 2018
Commit: 054e889a93e56a441ef6562376ef89a8781fb32b
Author: Nick Wu
Date: Thu Jun 7 10:30:18 2018 +0800
Branches: soc-2018-npr
https://developer.blender.org/rB054e889a93e56a441ef6562376ef89a8781fb32b
Merge remote-tracking branch 'remotes/origin/blender2.8' into soc-2018-npr
Conflicts:
release/scripts/addons
release/scripts/addons_contrib
source/tools
===================================================================
===================================================================
diff --cc release/scripts/startup/bl_ui/properties_scene.py
index de618a4a024,33e89014538..b10046654a3
--- a/release/scripts/startup/bl_ui/properties_scene.py
+++ b/release/scripts/startup/bl_ui/properties_scene.py
@@@ -477,81 -475,25 +475,99 @@@ class SCENE_PT_viewport_display(SceneBu
col.prop(scene.display, "light_direction")
col.prop(scene.display, "shadow_shift")
+class SCENE_PT_lanpr(SceneButtonsPanel, PropertyPanel, Panel):
+ COMPAT_ENGINES = {'BLENDER_CLAY'}
+ bl_label = "LANPR AHOY"
+
+ @classmethod
+ def poll(cls, context):
+ return True
+
+ def draw(self, context):
+ layout = self.layout
+ scene = context.scene
+ lanpr = scene.lanpr
+
+ layout.prop(lanpr, "master_mode")
+
+ if lanpr.master_mode == "DPIX":
+ layout.label(text="DPIX:")
+ layout.prop(lanpr, "reloaded")
+ split = layout.split()
+ col = split.column()
+ col.prop(lanpr, "background_color")
+ col = split.column()
+ col.prop(lanpr, "line_color")
+
+ else:
+ layout.label(text="Snake:")
+ layout.prop(lanpr, "enable_vector_trace")
+
+ if lanpr.enable_vector_trace == "DISABLED":
+ layout.prop(lanpr, "display_thinning_result")
+
+ layout.prop(lanpr, "depth_clamp")
+ layout.prop(lanpr, "depth_strength")
+ layout.prop(lanpr, "normal_clamp")
+ layout.prop(lanpr, "normal_strength")
+
+ if lanpr.enable_vector_trace == "ENABLED":
+
+ split = layout.split()
+ col = split.column()
+ col.prop(lanpr, "background_color")
+ col = split.column()
+ col.prop(lanpr, "line_color")
+
+ layout.label(text="Thickness:")
+ layout.prop(lanpr, "line_thickness")
+
+ layout.label(text="Effect Settings:")
+
+ layout.prop(lanpr, "use_same_taper")
+
+ if lanpr.use_same_taper == "DISABLED":
+ split = layout.split()
+ col = split.column()
+ col.label(text="Left:")
+ col.prop(lanpr,"taper_left_distance")
+ col.prop(lanpr,"taper_left_strength")
+ col = split.column()
+ col.label(text="Right:")
+ col.prop(lanpr,"taper_right_distance")
+ col.prop(lanpr,"taper_right_strength")
+ else:
+ layout.prop(lanpr,"taper_left_distance")
+ layout.prop(lanpr,"taper_left_strength")
+
+ layout.prop(lanpr, "enable_tip_extend")
+ if lanpr.enable_tip_extend == "ENABLED":
+ layout.prop(lanpr,"extend_length")
+
+ else: #disabled vectorization
+ layout.label(text="Adjust values to avoid large pure white regions!")
+
+
+
+ class SCENE_PT_viewport_display_ssao(SceneButtonsPanel, Panel):
+ bl_label = "Viewport Display SSAO"
+ bl_parent_id = "SCENE_PT_viewport_display"
+
+ @classmethod
+ def poll(cls, context):
+ return True
+
+ def draw(self, context):
+ layout = self.layout
+ layout.use_property_split = True
+ scene = context.scene
+ col = layout.column()
+ col.prop(scene.display, "matcap_ssao_samples")
+ col.prop(scene.display, "matcap_ssao_distance")
+ col.prop(scene.display, "matcap_ssao_attenuation")
+
+
class SCENE_PT_custom_props(SceneButtonsPanel, PropertyPanel, Panel):
COMPAT_ENGINES = {'BLENDER_RENDER', 'BLENDER_CLAY', 'BLENDER_EEVEE'}
_context_path = "scene"
diff --cc source/blender/makesrna/intern/rna_scene.c
index dff765402d1,8055c8fe4d6..33512d9548c
--- a/source/blender/makesrna/intern/rna_scene.c
+++ b/source/blender/makesrna/intern/rna_scene.c
@@@ -6168,185 -6167,9 +6168,185 @@@ static void rna_def_scene_eevee(Blender
RNA_def_property_boolean_sdna(prop, NULL, "flag", SCE_EEVEE_SHADOW_HIGH_BITDEPTH);
RNA_def_property_boolean_default(prop, 0);
RNA_def_property_ui_text(prop, "High Bitdepth", "Use 32bit shadows");
- RNA_def_property_flag(prop, PROP_OVERRIDABLE_STATIC);
+ 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", ICON_MESH_CUBE, "Idle", "Idle"},
+ {1, "RELOAD", ICON_MESH_CUBE, "RELOAD", "Force reload the scene"},
+ {0, NULL, 0, NULL, NULL}
+ };
+
+ static const EnumPropertyItem rna_enum_lanpr_master_mode[] = {
+ {LANPR_MASTER_MODE_DPIX, "DPIX", ICON_MESH_CUBE, "DPIX", "DPIX GPU edge calculation"},
+ {LANPR_MASTER_MODE_SNAKE, "SNAKE", ICON_MESH_CUBE, "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", ICON_MESH_CUBE, "Disabled", "LANPR does not compute anything"},
+ {LANPR_POST_PROCESSING_ENABLED, "ENABLED", ICON_MESH_CUBE, "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", ICON_MESH_CUBE, "Edge Detection", "Display edge detector result"},
+ {LANPR_POST_PROCESSING_ENABLED, "ENABLED", ICON_MESH_CUBE, "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", ICON_MESH_CUBE, "Different", "Use different taper value"},
+ {LANPR_USE_SAME_TAPER, "ENABLED", ICON_MESH_CUBE, "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", ICON_MESH_CUBE, "Disable", "Do not extend curve tips"},
+ {LANPR_ENABLE_TIP_EXTEND, "ENABLED", ICON_MESH_CUBE, "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, "taper_left_distance"
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list