Merge branch 'master' into 2.18.0

README.md

@@ -27,20 +27,20 @@ npm i --save gl-react-native
 **on Android:**
 
 1. `android/settings.gradle`:: Add the following snippet
-  ```gradle
-  include ':RNGL'
-  project(':RNGL').projectDir = file('../node_modules/gl-react-native/android')
-  ```
+```gradle
+include ':RNGL'
+project(':RNGL').projectDir = file('../node_modules/gl-react-native/android')
+```
 1. `android/app/build.gradle`: Add in dependencies block.
-  ```gradle
-  compile project(':RNGL')
-  ```
+```gradle
+compile project(':RNGL')
+```
 1. in your `MainActivity` (or equivalent):
-  ```java
-  import com.projectseptember.RNGL.RNGLPackage;
-  ...
+```java
+import com.projectseptember.RNGL.RNGLPackage;
+...
 
-  mReactInstanceManager = ReactInstanceManager.builder()
+mReactInstanceManager = ReactInstanceManager.builder()
     .setApplication(getApplication())
     ...
     .addPackage(new MainReactPackage())
@@ -48,4 +48,4 @@ npm i --save gl-react-native
     ...
     .build();
 
-  ```
+```

ios/GLCanvas.m

@@ -341,7 +341,6 @@ RCT_NOT_IMPLEMENTED(-init)
     if (imgData) contentData[i] = imgData;
   }
   _contentData = contentData;
-  _deferredRendering = false;
   [self setNeedsDisplay];
   RCT_PROFILE_END_EVENT(0, @"gl", nil);
 }
@@ -406,14 +405,13 @@ RCT_NOT_IMPLEMENTED(-init)
     return;
   }
 
-  bool willRender = !_deferredRendering;
-
-  if ([_nbContentTextures intValue] > 0 && !_autoRedraw) {
+  BOOL needsDeferredRendering = [_nbContentTextures intValue] > 0 && !_autoRedraw;
+  if (needsDeferredRendering && !_deferredRendering) {
     _deferredRendering = true;
     [self performSelectorOnMainThread:@selector(syncContentData) withObject:nil waitUntilDone:NO];
   }
-
-  if (willRender) {
+  else {
+    _deferredRendering = false;
     [self render];
     if (!_captureScheduled && [_captureConfigs count] > 0) {
       _captureScheduled = true;

package.json

 {
   "name": "gl-react-native",
-  "version": "2.17.5",
+  "version": "2.17.8",
   "description": "OpenGL bindings for react-native to implement complex effects over images and components, in the descriptive VDOM paradigm",
   "repository": {
     "type": "git",