Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuca Rood <dev@lucarood.com>2017-05-09 17:23:47 +0300
committerLuca Rood <dev@lucarood.com>2017-05-12 17:14:55 +0300
commit0eb32ab22809d9c0c41bfff5082f58b1a7aa9965 (patch)
tree8dc78f984f1d8c2bc48610708b08818e077a0436 /release
parentbd31b1f182c946f98478d6de8db890e158bc62ec (diff)
Implement hair drawing with Draw Manager in Clay engine
Part of T51378
Diffstat (limited to 'release')
-rw-r--r--release/scripts/startup/bl_ui/properties_collection.py10
-rw-r--r--release/scripts/startup/bl_ui/properties_render.py10
2 files changed, 20 insertions, 0 deletions
diff --git a/release/scripts/startup/bl_ui/properties_collection.py b/release/scripts/startup/bl_ui/properties_collection.py
index dc02037586c..4e545778162 100644
--- a/release/scripts/startup/bl_ui/properties_collection.py
+++ b/release/scripts/startup/bl_ui/properties_collection.py
@@ -68,6 +68,16 @@ class COLLECTION_PT_clay_settings(CollectionButtonsPanel, Panel):
col.template_override_property(collection_props, scene_props, "ssao_factor_edge")
col.template_override_property(collection_props, scene_props, "ssao_distance")
col.template_override_property(collection_props, scene_props, "ssao_attenuation")
+ col.template_override_property(collection_props, scene_props, "world_intensity")
+
+ col.separator()
+ col.label("Hair Settings:")
+ col.template_override_property(collection_props, scene_props, "diffuse_intensity")
+ col.template_override_property(collection_props, scene_props, "specular_intensity")
+ col.template_override_property(collection_props, scene_props, "specular_hardness")
+ col.template_override_property(collection_props, scene_props, "color_randomicity")
+ col.template_override_property(collection_props, scene_props, "hair_diffuse_color")
+ col.template_override_property(collection_props, scene_props, "hair_specular_color")
class COLLECTION_PT_object_mode_settings(CollectionButtonsPanel, Panel):
diff --git a/release/scripts/startup/bl_ui/properties_render.py b/release/scripts/startup/bl_ui/properties_render.py
index 0431cd51663..e56c559a163 100644
--- a/release/scripts/startup/bl_ui/properties_render.py
+++ b/release/scripts/startup/bl_ui/properties_render.py
@@ -615,6 +615,16 @@ class RENDER_PT_clay_collection_settings(RenderButtonsPanel, Panel):
col.prop(props, "ssao_distance")
col.prop(props, "ssao_attenuation")
+ col.separator()
+ col.label("Hair Settings:")
+ col.prop(props, "world_intensity")
+ col.prop(props, "diffuse_intensity")
+ col.prop(props, "specular_intensity")
+ col.prop(props, "specular_hardness")
+ col.prop(props, "color_randomicity")
+ col.prop(props, "hair_diffuse_color")
+ col.prop(props, "hair_specular_color")
+
class RENDER_PT_eevee_poststack_settings(RenderButtonsPanel, Panel):
bl_label = "Post Process Stack"
COMPAT_ENGINES = {'BLENDER_EEVEE'}