bartvdbraak/blender
1
0
Fork 4
Code Issues 4 Pull Requests 1 Actions 1 Packages Projects Releases Wiki Activity

Cycles: Fix compilation in debug mode

Browse Source 
Please check compilation before committing refactor changes!
This commit is contained in:
Sergey Sharybin 2017-10-24 12:09:02 +02:00
parent eccd18a91f
commit e03df90bf3
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
intern/cycles/device/device.cpp
View File

@ -88,7 +88,7 @@ Device::~Device()
void Device::draw_pixels(device_memory& rgba, int y, int w, int h, int dx, int dy, int width, int height, bool transparent,
const DeviceDrawParams &draw_params)
{
assert(mem.type == MEM_PIXELS);
assert(rgba.type == MEM_PIXELS);
mem_copy_from(rgba, y, w, h, rgba.memory_elements_size(1));

4
intern/cycles/device/device_memory.h
View File

@ -303,7 +303,7 @@ public:
data_width = width;
data_height = height;
data_depth = depth;
assert(device_ptr == 0);
assert(device_pointer == 0);
return get_data();
}
@ -331,7 +331,7 @@ public:
data_width = width;
data_height = height;
data_depth = depth;
assert(device_ptr == 0);
assert(device_pointer == 0);
return get_data();
}