Merge branch 'blender-v2.90-release' into master

2020-08-26 23:28:44 +10:00
parent 826bd46e66 e0772c6607
commit 08ec9b71df
3 changed files with 17 additions and 11 deletions
--- a/source/blender/editors/space_buttons/buttons_context.c
+++ b/source/blender/editors/space_buttons/buttons_context.c
@@ -795,8 +795,12 @@ const char *buttons_context_dir[] = {
    "line_style",
    "collection",
    "gpencil",
+#ifdef WITH_HAIR_NODES
    "hair",
+#endif
+#ifdef WITH_PARTICLE_NODES
    "pointcloud",
+#endif
    "volume",
    NULL,
 };