Merge branch 'blender2.7'
authorSergey Sharybin <sergey.vfx@gmail.com>
Fri, 4 Jan 2019 11:42:13 +0000 (12:42 +0100)
committerSergey Sharybin <sergey.vfx@gmail.com>
Fri, 4 Jan 2019 11:42:13 +0000 (12:42 +0100)
1  2 
source/blender/gpu/intern/gpu_extensions.c

index 5796295115498c2ab1675ca3f939b478255f5a37,2ddb779ce23e08afafdce1a362ba6092a48affd9..10bd5810cc9e39cb08976912c3e864d2afb27187
@@@ -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;
        }