archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Fix T58183: crash with CPU + GPU rendering after profiling changes.

Browse Source 
Multi-device was not passing along profiler to the CPU.
This commit is contained in:
Brecht Van Lommel
2018-11-29 23:30:17 +01:00
parent 8ac2d85d2f
commit a8b8da5567
18 changed files with 64 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
intern/cycles/device/device_network.cpp
View File

@@ -56,8 +56,8 @@ public:
return false;
}
NetworkDevice(DeviceInfo& info, Stats &stats, const char *address)
: Device(info, stats, true), socket(io_service)
NetworkDevice(DeviceInfo& info, Stats &stats, Profiler &profiler, const char *address)
: Device(info, stats, profiler, true), socket(io_service)
{
error_func = NetworkError();
stringstream portstr;
@@ -293,9 +293,9 @@ private:
NetworkError error_func;
};
Device *device_network_create(DeviceInfo& info, Stats &stats, const char *address)
Device *device_network_create(DeviceInfo& info, Stats &stats, Profiler &profiler, const char *address)
{
return new NetworkDevice(info, stats, address);
return new NetworkDevice(info, stats, profiler, address);
}
void device_network_info(vector<DeviceInfo>& devices)