[Bf-blender-cvs] [785fc137cef] master: Merge branch 'blender2.7'

[Sergey Sharybin]

Commit: 785fc137cefd7b7afda0b724be9954a2faa27763
Author: Sergey Sharybin
Date:   Fri Jan 4 12:42:13 2019 +0100
Branches: master
https://developer.blender.org/rB785fc137cefd7b7afda0b724be9954a2faa27763

Merge branch 'blender2.7'

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



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

diff --cc source/blender/gpu/intern/gpu_extensions.c
index 57962951154,2ddb779ce23..10bd5810cc9
--- a/source/blender/gpu/intern/gpu_extensions.c
+++ b/source/blender/gpu/intern/gpu_extensions.c
@@@ -339,8 -196,11 +339,12 @@@ void gpu_extensions_init(void
  		GG.device = GPU_DEVICE_SOFTWARE;
  		GG.driver = GPU_DRIVER_SOFTWARE;
  	}
+ 	else if (strstr(renderer, "llvmpipe")) {
+ 		GG.device = GPU_DEVICE_SOFTWARE;
+ 		GG.driver = GPU_DRIVER_SOFTWARE;
+ 	}
  	else {
 +		printf("Warning: Could not find a matching GPU name. Things may not behave as expected.\n");
  		GG.device = GPU_DEVICE_ANY;
  		GG.driver = GPU_DRIVER_ANY;
  	}