[Bf-blender-cvs] [cf1bac3] master: Cycles: Solve some harmless NULL pointer magic
Sergey Sharybin
noreply at git.blender.org
Tue Jun 30 23:43:20 CEST 2015
Commit: cf1bac3f6900a896a7964716beaaef581d23efec
Author: Sergey Sharybin
Date: Tue Jun 30 23:23:38 2015 +0200
Branches: master
https://developer.blender.org/rBcf1bac3f6900a896a7964716beaaef581d23efec
Cycles: Solve some harmless NULL pointer magic
Was harmless but confused some sanity checks, also kinda makes sense
to be more verbose about what's going on there.
===================================================================
M intern/cycles/device/device_memory.h
===================================================================
diff --git a/intern/cycles/device/device_memory.h b/intern/cycles/device/device_memory.h
index 7df2bc1..ba79f8c 100644
--- a/intern/cycles/device/device_memory.h
+++ b/intern/cycles/device/device_memory.h
@@ -212,11 +212,14 @@ public:
{
data_size = width * ((height == 0)? 1: height) * ((depth == 0)? 1: depth);
data.resize(data_size);
- data_pointer = (device_ptr)&data[0];
data_width = width;
data_height = height;
data_depth = depth;
-
+ if(data_size == 0) {
+ data_pointer = 0;
+ return NULL;
+ }
+ data_pointer = (device_ptr)&data[0];
return &data[0];
}
More information about the Bf-blender-cvs
mailing list