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 /source/blender/compositor/COM_compositor.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 'source/blender/compositor/COM_compositor.h')
| -rw-r--r-- | source/blender/compositor/COM_compositor.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/source/blender/compositor/COM_compositor.h b/source/blender/compositor/COM_compositor.h index 9b22444cf7f..a5d7704a708 100644 --- a/source/blender/compositor/COM_compositor.h +++ b/source/blender/compositor/COM_compositor.h @@ -38,7 +38,7 @@ extern "C" { * @defgroup Node All nodes of the compositor * @defgroup Operation All operations of the compositor * - * @mainpage Introduction of the Blender Compositor + * @page Introduction of the Blender Compositor * * @section bcomp Blender compositor * This project redesigns the internals of Blender's compositor. The project has been executed in 2011 by At Mind. @@ -316,7 +316,8 @@ extern "C" { * generation in display space */ void COM_execute(RenderData *rd, Scene *scene, bNodeTree *editingtree, int rendering, - const ColorManagedViewSettings *viewSettings, const ColorManagedDisplaySettings *displaySettings); + const ColorManagedViewSettings *viewSettings, const ColorManagedDisplaySettings *displaySettings, + const char *viewName); /** * @brief Deinitialize the compositor caches and allocated memory. |