Merge branch 'master' into blender2.8
Conflicts: source/blender/depsgraph/intern/builder/deg_builder_relations.cc source/blender/editors/object/object_add.c source/blender/python/intern/bpy_app_handlers.c
This commit is contained in:
@@ -53,7 +53,6 @@ public:
|
||||
int num;
|
||||
bool display_device;
|
||||
bool advanced_shading;
|
||||
bool pack_images;
|
||||
bool has_bindless_textures; /* flag for GPU and Multi device */
|
||||
bool use_split_kernel; /* Denotes if the device is going to run cycles using split-kernel */
|
||||
vector<DeviceInfo> multi_devices;
|
||||
@@ -65,7 +64,6 @@ public:
|
||||
num = 0;
|
||||
display_device = false;
|
||||
advanced_shading = true;
|
||||
pack_images = false;
|
||||
has_bindless_textures = false;
|
||||
use_split_kernel = false;
|
||||
}
|
||||
|
Reference in New Issue
Block a user