[Bf-blender-cvs] [45745f7862b] master: Fix: Gain socket is not available in ridged multifractal.

OmarSquircleArt noreply at git.blender.org
Fri Oct 4 16:08:52 CEST 2019


Commit: 45745f7862beb8baaf060d66ca97513d5dd9d848
Author: OmarSquircleArt
Date:   Fri Oct 4 16:05:36 2019 +0200
Branches: master
https://developer.blender.org/rB45745f7862beb8baaf060d66ca97513d5dd9d848

Fix: Gain socket is not available in ridged multifractal.

The gain socket in the Musgrave node should be available in the ridged
multifractal mode. The logic for the availability was incorrect.

Reviewers: brecht

Differential Revision: https://developer.blender.org/D5989

===================================================================

M	source/blender/nodes/shader/nodes/node_shader_tex_musgrave.c

===================================================================

diff --git a/source/blender/nodes/shader/nodes/node_shader_tex_musgrave.c b/source/blender/nodes/shader/nodes/node_shader_tex_musgrave.c
index daf4053f182..56e102a118d 100644
--- a/source/blender/nodes/shader/nodes/node_shader_tex_musgrave.c
+++ b/source/blender/nodes/shader/nodes/node_shader_tex_musgrave.c
@@ -136,8 +136,8 @@ static void node_shader_update_tex_musgrave(bNodeTree *UNUSED(ntree), bNode *nod
                             tex->musgrave_type != SHD_MUSGRAVE_MULTIFRACTAL &&
                                 tex->musgrave_type != SHD_MUSGRAVE_FBM);
   nodeSetSocketAvailability(inGainSock,
-                            tex->musgrave_type == SHD_MUSGRAVE_HYBRID_MULTIFRACTAL &&
-                                tex->musgrave_type != SHD_MUSGRAVE_RIDGED_MULTIFRACTAL);
+                            tex->musgrave_type == SHD_MUSGRAVE_HYBRID_MULTIFRACTAL ||
+                                tex->musgrave_type == SHD_MUSGRAVE_RIDGED_MULTIFRACTAL);
 }
 
 void register_node_type_sh_tex_musgrave(void)



More information about the Bf-blender-cvs mailing list