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:
authorKévin Dietrich <kevin.dietrich@mailoo.org>2021-08-20 15:49:43 +0300
committerKévin Dietrich <kevin.dietrich@mailoo.org>2021-08-20 15:49:43 +0300
commit8c77e65cb4e509c6d83357787ee50d70113c36e1 (patch)
tree74395485e0853cf9694d7cb1bc3984a2e26c151f /source/blender/editors
parentaf2b3a7178e25e0c35e8ec621cc6e21c2b0d62cb (diff)
parent6a404bc633586a96d635e2e3bf2e207f87ab3785 (diff)
Merge branch 'master' into cycles_procedural_api
Diffstat (limited to 'source/blender/editors')
-rw-r--r--source/blender/editors/interface/interface_templates.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/source/blender/editors/interface/interface_templates.c b/source/blender/editors/interface/interface_templates.c
index b76b85ccbef..a9e44b10f27 100644
--- a/source/blender/editors/interface/interface_templates.c
+++ b/source/blender/editors/interface/interface_templates.c
@@ -6527,10 +6527,6 @@ void uiTemplateCacheFile(uiLayout *layout,
uiItemR(layout, &fileptr, "velocity_name", 0, NULL, ICON_NONE);
uiItemR(layout, &fileptr, "velocity_unit", 0, NULL, ICON_NONE);
- row = uiLayoutRow(layout, false);
- uiLayoutSetActive(row, engine_supports_procedural && use_render_procedural);
- uiItemR(row, &fileptr, "default_radius", 0, NULL, ICON_NONE);
-
/* TODO: unused for now, so no need to expose. */
#if 0
row = uiLayoutRow(layout, false);