diff options
author | Dalai Felinto <dfelinto@gmail.com> | 2015-09-24 18:24:20 +0300 |
---|---|---|
committer | Dalai Felinto <dfelinto@gmail.com> | 2015-09-24 18:24:20 +0300 |
commit | 27b3ea622f8bd313a8e2827dfec752bf2125566c (patch) | |
tree | f212e49d224ce8e1cfc3b17a64ae524711494391 /intern/cycles/device/device_task.h | |
parent | 372dff8d1dc7e24d4b2cd37de245588ecfce8bfa (diff) | |
parent | de80e687689032cb85179a1f7e89750573631d5d (diff) |
Merge remote-tracking branch 'origin/master' into cycles_camera_nodescycles_camera_nodes
Note: the branch currently crashes in blender_camera_nodes.cpp:
BL::NodeTree b_ntree = b_data.node_groups[nodes_tree_name];
The crash was introduced in:
cb7cf523e5c000609f32a382e2c0fcc57f635a42
Conflicts:
intern/cycles/SConscript
intern/cycles/blender/addon/__init__.py
intern/cycles/blender/addon/properties.py
intern/cycles/blender/blender_camera.cpp
intern/cycles/kernel/kernel_types.h
intern/cycles/kernel/svm/svm.h
intern/cycles/kernel/svm/svm_types.h
intern/cycles/render/camera.cpp
intern/cycles/render/camera.h
Diffstat (limited to 'intern/cycles/device/device_task.h')
-rw-r--r-- | intern/cycles/device/device_task.h | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/intern/cycles/device/device_task.h b/intern/cycles/device/device_task.h index 50216adefe2..834ea60988a 100644 --- a/intern/cycles/device/device_task.h +++ b/intern/cycles/device/device_task.h @@ -11,7 +11,7 @@ * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and - * limitations under the License + * limitations under the License. */ #ifndef __DEVICE_TASK_H__ @@ -57,14 +57,15 @@ public: void update_progress(RenderTile *rtile); - boost::function<bool(Device *device, RenderTile&)> acquire_tile; - boost::function<void(void)> update_progress_sample; - boost::function<void(RenderTile&)> update_tile_sample; - boost::function<void(RenderTile&)> release_tile; - boost::function<bool(void)> get_cancel; + function<bool(Device *device, RenderTile&)> acquire_tile; + function<void(void)> update_progress_sample; + function<void(RenderTile&)> update_tile_sample; + function<void(RenderTile&)> release_tile; + function<bool(void)> get_cancel; bool need_finish_queue; bool integrator_branched; + int2 requested_tile_size; protected: double last_update_time; }; |