-- Add Lacunarity and Normalize inputs

-- Refactor variable names.

@@ -397,0 +425,4 @@
+
+        bNode *subNode = nodeAddStaticNode(nullptr, ntree, SH_NODE_MATH);
+        subNode->custom1 = NODE_MATH_SUBTRACT;
+        subNode->locx = node->locx;

@@ -408,0 +412,4 @@
+    if (node->type == SH_NODE_TEX_MUSGRAVE_DEPRECATED) {
+      STRNCPY(node->idname, "ShaderNodeTexNoise");
+      node->type = SH_NODE_TEX_NOISE;
+      NodeTexNoise *data = (NodeTexNoise *)MEM_callocN(sizeof(NodeTexNoise), __func__);

@@ -408,0 +413,4 @@
+      STRNCPY(node->idname, "ShaderNodeTexNoise");
+      node->type = SH_NODE_TEX_NOISE;
+      NodeTexNoise *data = (NodeTexNoise *)MEM_callocN(sizeof(NodeTexNoise), __func__);
+      data->base = ((NodeTexMusgrave *)node->storage)->base;

@@ -408,0 +440,4 @@
+        subNode1->locx = node->locx;
+        subNode1->locy = node->locy - 300.0f;
+        subNode1->flag |= NODE_HIDDEN;
+        bNodeSocket *subSock1A = static_cast<bNodeSocket *>(BLI_findlink(&subNode1->inputs, 0));

@@ -583,0 +592,4 @@
+      data->dimensions = (static_cast<NodeTexMusgrave *>(node->storage))->dimensions;
+      data->normalize = false;
+      data->type = (static_cast<NodeTexMusgrave *>(node->storage))->musgrave_type;
+      node->storage = data;

@@ -588,0 +591,4 @@
+  LISTBASE_FOREACH (bNode *, node, &ntree->nodes) {
+    if (node->type == SH_NODE_TEX_MUSGRAVE_DEPRECATED) {
+      STRNCPY(node->idname, "ShaderNodeTexNoise");
+      node->type = VERSIONING_NODE_1;

@@ -588,0 +597,4 @@
+      data->dimensions = (static_cast<NodeTexMusgrave *>(node->storage))->dimensions;
+      data->normalize = false;
+      data->type = (static_cast<NodeTexMusgrave *>(node->storage))->musgrave_type;
+      node->storage = data;

@@ -588,0 +603,4 @@
+      float *detail = version_cycles_node_socket_float_value(sockDetail);
+
+      bNodeSocket *sockFac = nodeFindSocket(node, SOCK_OUT, "Fac");
+      if (sockFac->label[0] != '\0') {

@@ -588,0 +610,4 @@
+      uint8_t noise_type = (static_cast<NodeTexNoise *>(node->storage))->type;
+      float locyoffset = 0.0f;
+
+      if (version_node_socket_is_used(sockDetail) && sockDetail->link != nullptr) {

@@ -588,0 +597,4 @@
+      data->dimensions = (static_cast<NodeTexMusgrave *>(node->storage))->dimensions;
+      data->normalize = false;
+      data->type = (static_cast<NodeTexMusgrave *>(node->storage))->musgrave_type;
+      MEM_freeN(node->storage);

@@ -595,0 +611,4 @@
+        }
+      }
+
+      bNodeSocket *sockRoughness = nodeFindSocket(node, SOCK_IN, "Roughness");

@@ -535,3 +535,2 @@
 template<typename T>
-float perlin_fractal_template(
-    T position, float octaves, float roughness, float lacunarity, bool normalize)
+float perlin_fbm(

@@ -764,3 +563,1 @@
-/* -------------------------------------------------------------------- */
-/** \name Musgrave Noise
- * \{ */
+/* Explicilt instantiation for Wave Texture. */

@@ -596,0 +600,4 @@
+    if (node->type == SH_NODE_TEX_NOISE) {
+      (static_cast<NodeTexNoise *>(node->storage))->type = SHD_NOISE_FBM;
+
+      bNodeSocket *sockRoughness = nodeFindSocket(node, SOCK_IN, "Roughness");

@@ -596,0 +612,4 @@
+      bNode *roughnessFromNode = nullptr;
+      bNodeSocket *roughnessFromSock = nullptr;
+
+      LISTBASE_FOREACH_BACKWARD_MUTABLE (bNodeLink *, link, &ntree->links) {

@@ -596,0 +614,4 @@
+
+      LISTBASE_FOREACH_BACKWARD_MUTABLE (bNodeLink *, link, &ntree->links) {
+        /* Find links, nodes and sockets. */
+        if ((link->tonode == node) && (STREQ(link->tosock->identifier, "Roughness"))) {

@@ -596,0 +655,4 @@
+{
+  version_node_input_socket_name(ntree, SH_NODE_TEX_MUSGRAVE_DEPRECATED, "Dimension", "Roughness");
+  LISTBASE_FOREACH (bNode *, node, &ntree->nodes) {
+    if (node->type == SH_NODE_TEX_MUSGRAVE_DEPRECATED) {

@@ -596,0 +678,4 @@
+      bNode *lacunarityFromNode = nullptr;
+      bNodeSocket *lacunarityFromSock = nullptr;
+
+      LISTBASE_FOREACH_BACKWARD_MUTABLE (bNodeLink *, link, &ntree->links) {

@@ -596,0 +712,4 @@
+      if (detailLink != nullptr) {
+        locyoffset -= 40.0f;
+
+        /* Add Subtract Math node before Detail input. */

@@ -145,6 +221,19 @@ class NoiseFunction : public mf::MultiFunction {
     const VArray<float> &detail = params.readonly_single_input<float>(param++, "Detail");
     const VArray<float> &roughness = params.readonly_single_input<float>(param++, "Roughness");
     const VArray<float> &lacunarity = params.readonly_single_input<float>(param++, "Lacunarity");
+    /* Initialize to any other variable when unused to avoid unnecessary conditionals */

@@ -1272,3 +1272,4 @@
   NodeTexBase base;
   int dimensions;
+  uint8_t type;
   uint8_t normalize;

@@ -20,3 +8,1 @@
-    maxamp += amp;
-    amp *= clamp(roughness, 0.0, 1.0);
-    fscale *= lacunarity;
+#define NOISE_FBM(T) \