Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/intern
diff options
context:
space:
mode:
authorSergey Sharybin <sergey.vfx@gmail.com>2017-10-24 13:09:02 +0300
committerSergey Sharybin <sergey.vfx@gmail.com>2017-10-24 13:09:02 +0300
commite03df90bf36f907a99ebd8cba6cf03cf05ca71a3 (patch)
tree69f511249505c4f27ab9380ec7232a6a215f5455 /intern
parenteccd18a91f55753425daee47ea000262689accd9 (diff)
Cycles: Fix compilation in debug mode
Please check compilation before committing refactor changes!
Diffstat (limited to 'intern')
-rw-r--r--intern/cycles/device/device.cpp2
-rw-r--r--intern/cycles/device/device_memory.h4
2 files changed, 3 insertions, 3 deletions
diff --git a/intern/cycles/device/device.cpp b/intern/cycles/device/device.cpp
index 41fbe7ce81b..1a3a3846c25 100644
--- a/intern/cycles/device/device.cpp
+++ b/intern/cycles/device/device.cpp
@@ -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));
diff --git a/intern/cycles/device/device_memory.h b/intern/cycles/device/device_memory.h
index 7bf8bdc1cea..e6b2d059ef3 100644
--- a/intern/cycles/device/device_memory.h
+++ b/intern/cycles/device/device_memory.h
@@ -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();
}