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/dualcon/intern/octree.cpp | |
| 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/dualcon/intern/octree.cpp')
| -rw-r--r-- | intern/dualcon/intern/octree.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/intern/dualcon/intern/octree.cpp b/intern/dualcon/intern/octree.cpp index bd7194cf3fd..da8638ebc4f 100644 --- a/intern/dualcon/intern/octree.cpp +++ b/intern/dualcon/intern/octree.cpp @@ -1448,7 +1448,7 @@ Node *Octree::locateCell(InternalNode *node, int st[3], int len, int ori[3], int return (Node *)node; } -void Octree::checkElement(PathElement *ele) +void Octree::checkElement(PathElement * /*ele*/) { /* if(ele != NULL && locateLeafCheck(ele->pos) != ele->node) { @@ -1797,7 +1797,7 @@ void Octree::clearProcessBits(Node *node, int height) } } -int Octree::floodFill(LeafNode *leaf, int st[3], int len, int height, int threshold) +int Octree::floodFill(LeafNode *leaf, int st[3], int len, int /*height*/, int threshold) { int i, j; int maxtotal = 0; @@ -2317,7 +2317,7 @@ void Octree::generateMinimizer(Node *node, int st[3], int len, int height, int& } } -void Octree::processEdgeWrite(Node *node[4], int depth[4], int maxdep, int dir) +void Octree::processEdgeWrite(Node *node[4], int /*depth*/[4], int /*maxdep*/, int dir) { //int color = 0; @@ -2553,7 +2553,7 @@ void Octree::cellProcContour(Node *node, int leaf, int depth) } -void Octree::processEdgeParity(LeafNode *node[4], int depth[4], int maxdep, int dir) +void Octree::processEdgeParity(LeafNode *node[4], int /*depth*/[4], int /*maxdep*/, int dir) { int con = 0; for (int i = 0; i < 4; i++) { |