Merge branch 'master' into blender2.8

1 files changed, 6 insertions, 6 deletions

diff --git a/source/blender/compositor/operations/COM_RenderLayersProg.cpp b/source/blender/compositor/operations/COM_RenderLayersProg.cpp
index ca135a650bd..e1a77158175 100644
--- a/source/blender/compositor/operations/COM_RenderLayersProg.cpp
+++ b/source/blender/compositor/operations/COM_RenderLayersProg.cpp
@@ -50,10 +50,10 @@ void RenderLayersProg::initExecution()
 	Scene *scene = this->getScene();
 	Render *re = (scene) ? RE_GetSceneRender(scene) : NULL;
 	RenderResult *rr = NULL;
-	
+
 	if (re)
 		rr = RE_AcquireResultRead(re);
-	
+
 	if (rr) {
 		ViewLayer *view_layer = (ViewLayer *)BLI_findlink(&scene->view_layers, getLayerId());
 		if (view_layer) {
@@ -181,13 +181,13 @@ void RenderLayersProg::determineResolution(unsigned int resolution[2], unsigned
 	Scene *sce = this->getScene();
 	Render *re = (sce) ? RE_GetSceneRender(sce) : NULL;
 	RenderResult *rr = NULL;
-	
+
 	resolution[0] = 0;
 	resolution[1] = 0;
-	
+
 	if (re)
 		rr = RE_AcquireResultRead(re);
-	
+
 	if (rr) {
 		ViewLayer *view_layer   = (ViewLayer *)BLI_findlink(&sce->view_layers, getLayerId());
 		if (view_layer) {
@@ -198,7 +198,7 @@ void RenderLayersProg::determineResolution(unsigned int resolution[2], unsigned
 			}
 		}
 	}
-	
+
 	if (re)
 		RE_ReleaseResult(re);