Merge pull request #1338 from lpeancovschi/v3.4.9

Fix xcode 7 crash fix when using CCDrawNode
cocos2d · Sep 21, 2015 · 5919dfa · 5919dfa
2 parents ee10230 + 1427575
commit 5919dfa
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/cocos2d/CCDrawNode.m b/cocos2d/CCDrawNode.m
@@ -53,10 +53,6 @@
     @"}\n";
 #else
 static NSString *CCDrawNodeFragmentShaderSource =
-	@"#ifdef GL_ES\n"
-	@"#extension GL_OES_standard_derivatives : enable\n"
-	@"#endif\n"
-	@"\n"
 	@"void main(){\n"
 	@"	gl_FragColor = cc_FragColor*smoothstep(0.0, length(fwidth(cc_FragTexCoord1)), 1.0 - length(cc_FragTexCoord1));\n"
 	@"}\n";

diff --git a/cocos2d/CCShader.m b/cocos2d/CCShader.m
@@ -62,6 +62,11 @@
 // These are the lines loaded for both vertex and fragment shaders
 
 static NSString *CCShaderHeader =
+    @"#ifdef GL_ES\n"
+    @"#ifdef GL_OES_standard_derivatives\n"
+    @"#extension GL_OES_standard_derivatives : enable\n"
+    @"#endif\n"
+    @"#endif\n"
 	@"#ifndef GL_ES\n"
 	@"#define lowp\n"
 	@"#define mediump\n"