Displacement Map: displace after morphing/skinning

src/renderers/shaders/ShaderChunk/defaultnormal_vertex.glsl

@@ -5,5 +5,3 @@ vec3 transformedNormal = normalMatrix * objectNormal;
 	transformedNormal = - transformedNormal;
 
 #endif
-
-

src/renderers/shaders/ShaderChunk/displacementmap_vertex.glsl

@@ -1,14 +1,5 @@
 #ifdef USE_DISPLACEMENTMAP
 
-	#ifdef USE_MORPHNORMALS
-
-		transformed += morphNormal * ( texture2D( displacementMap, uv ).x * displacementScale + displacementBias );
-
-	#else
-
-		transformed += normal * ( texture2D( displacementMap, uv ).x * displacementScale + displacementBias );
-
-	#endif
-
+	transformed += normalize(objectNormal) * ( texture2D( displacementMap, uv ).x * displacementScale + displacementBias );
 
 #endif

src/renderers/shaders/ShaderChunk/morphnormal_vertex.glsl

@@ -5,10 +5,4 @@
 	objectNormal += ( morphNormal2 - normal ) * morphTargetInfluences[ 2 ];
 	objectNormal += ( morphNormal3 - normal ) * morphTargetInfluences[ 3 ];
 
-	#ifdef USE_DISPLACEMENTMAP
-
-		vec3 morphNormal = normalize(objectNormal);
-
-	#endif
-
 #endif

src/renderers/shaders/ShaderLib/depth_vert.glsl

@@ -13,9 +13,9 @@ void main() {
 	#include <skinbase_vertex>
 
 	#include <begin_vertex>
-	#include <displacementmap_vertex>
 	#include <morphtarget_vertex>
 	#include <skinning_vertex>
+	#include <displacementmap_vertex>
 	#include <project_vertex>
 	#include <logdepthbuf_vertex>
 	#include <clipping_planes_vertex>

src/renderers/shaders/ShaderLib/meshphong_vert.glsl

@@ -40,9 +40,9 @@ void main() {
 #endif
 
 	#include <begin_vertex>
-	#include <displacementmap_vertex>
 	#include <morphtarget_vertex>
 	#include <skinning_vertex>
+	#include <displacementmap_vertex>
 	#include <project_vertex>
 	#include <logdepthbuf_vertex>
 	#include <clipping_planes_vertex>

src/renderers/shaders/ShaderLib/meshphysical_vert.glsl

@@ -39,9 +39,9 @@ void main() {
 #endif
 
 	#include <begin_vertex>
-	#include <displacementmap_vertex>
 	#include <morphtarget_vertex>
 	#include <skinning_vertex>
+	#include <displacementmap_vertex>
 	#include <project_vertex>
 	#include <logdepthbuf_vertex>
 	#include <clipping_planes_vertex>

src/renderers/shaders/ShaderLib/normal_vert.glsl

@@ -35,9 +35,9 @@ void main() {
 #endif
 
 	#include <begin_vertex>
-	#include <displacementmap_vertex>
 	#include <morphtarget_vertex>
 	#include <skinning_vertex>
+	#include <displacementmap_vertex>
 	#include <project_vertex>
 	#include <logdepthbuf_vertex>