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/freestyle/intern/python/Interface1D/FEdge/BPy_FEdgeSmooth.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 'source/blender/freestyle/intern/python/Interface1D/FEdge/BPy_FEdgeSmooth.cpp')
| -rw-r--r-- | source/blender/freestyle/intern/python/Interface1D/FEdge/BPy_FEdgeSmooth.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/freestyle/intern/python/Interface1D/FEdge/BPy_FEdgeSmooth.cpp b/source/blender/freestyle/intern/python/Interface1D/FEdge/BPy_FEdgeSmooth.cpp index a2079c7d685..cf893ad9481 100644 --- a/source/blender/freestyle/intern/python/Interface1D/FEdge/BPy_FEdgeSmooth.cpp +++ b/source/blender/freestyle/intern/python/Interface1D/FEdge/BPy_FEdgeSmooth.cpp @@ -99,7 +99,7 @@ static int FEdgeSmooth_mathutils_check(BaseMathObject *bmo) return 0; } -static int FEdgeSmooth_mathutils_get(BaseMathObject *bmo, int subtype) +static int FEdgeSmooth_mathutils_get(BaseMathObject *bmo, int /*subtype*/) { BPy_FEdgeSmooth *self = (BPy_FEdgeSmooth *)bmo->cb_user; Vec3r p(self->fes->normal()); @@ -109,7 +109,7 @@ static int FEdgeSmooth_mathutils_get(BaseMathObject *bmo, int subtype) return 0; } -static int FEdgeSmooth_mathutils_set(BaseMathObject *bmo, int subtype) +static int FEdgeSmooth_mathutils_set(BaseMathObject *bmo, int /*subtype*/) { BPy_FEdgeSmooth *self = (BPy_FEdgeSmooth *)bmo->cb_user; Vec3r p(bmo->data[0], bmo->data[1], bmo->data[2]); @@ -117,7 +117,7 @@ static int FEdgeSmooth_mathutils_set(BaseMathObject *bmo, int subtype) return 0; } -static int FEdgeSmooth_mathutils_get_index(BaseMathObject *bmo, int subtype, int index) +static int FEdgeSmooth_mathutils_get_index(BaseMathObject *bmo, int /*subtype*/, int index) { BPy_FEdgeSmooth *self = (BPy_FEdgeSmooth *)bmo->cb_user; Vec3r p(self->fes->normal()); @@ -125,7 +125,7 @@ static int FEdgeSmooth_mathutils_get_index(BaseMathObject *bmo, int subtype, int return 0; } -static int FEdgeSmooth_mathutils_set_index(BaseMathObject *bmo, int subtype, int index) +static int FEdgeSmooth_mathutils_set_index(BaseMathObject *bmo, int /*subtype*/, int index) { BPy_FEdgeSmooth *self = (BPy_FEdgeSmooth *)bmo->cb_user; Vec3r p(self->fes->normal()); |