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/BPy_StrokeShader.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/BPy_StrokeShader.cpp')
-rw-r--r-- | source/blender/freestyle/intern/python/BPy_StrokeShader.cpp | 36 |
1 files changed, 0 insertions, 36 deletions
diff --git a/source/blender/freestyle/intern/python/BPy_StrokeShader.cpp b/source/blender/freestyle/intern/python/BPy_StrokeShader.cpp index a6c7a40e780..6b4a1872b61 100644 --- a/source/blender/freestyle/intern/python/BPy_StrokeShader.cpp +++ b/source/blender/freestyle/intern/python/BPy_StrokeShader.cpp @@ -32,11 +32,9 @@ #include "StrokeShader/BPy_BlenderTextureShader.h" #include "StrokeShader/BPy_CalligraphicShader.h" #include "StrokeShader/BPy_ColorNoiseShader.h" -#include "StrokeShader/BPy_ColorVariationPatternShader.h" #include "StrokeShader/BPy_ConstantColorShader.h" #include "StrokeShader/BPy_ConstantThicknessShader.h" #include "StrokeShader/BPy_ConstrainedIncreasingThicknessShader.h" -#include "StrokeShader/BPy_fstreamShader.h" #include "StrokeShader/BPy_GuidingLinesShader.h" #include "StrokeShader/BPy_IncreasingColorShader.h" #include "StrokeShader/BPy_IncreasingThicknessShader.h" @@ -44,12 +42,8 @@ #include "StrokeShader/BPy_SamplingShader.h" #include "StrokeShader/BPy_SmoothingShader.h" #include "StrokeShader/BPy_SpatialNoiseShader.h" -#include "StrokeShader/BPy_streamShader.h" -#include "StrokeShader/BPy_StrokeTextureShader.h" #include "StrokeShader/BPy_StrokeTextureStepShader.h" -#include "StrokeShader/BPy_TextureAssignerShader.h" #include "StrokeShader/BPy_ThicknessNoiseShader.h" -#include "StrokeShader/BPy_ThicknessVariationPatternShader.h" #include "StrokeShader/BPy_TipRemoverShader.h" #ifdef __cplusplus @@ -94,11 +88,6 @@ int StrokeShader_Init(PyObject *module) Py_INCREF(&ColorNoiseShader_Type); PyModule_AddObject(module, "ColorNoiseShader", (PyObject *)&ColorNoiseShader_Type); - if (PyType_Ready(&ColorVariationPatternShader_Type) < 0) - return -1; - Py_INCREF(&ColorVariationPatternShader_Type); - PyModule_AddObject(module, "ColorVariationPatternShader", (PyObject *)&ColorVariationPatternShader_Type); - if (PyType_Ready(&ConstantColorShader_Type) < 0) return -1; Py_INCREF(&ConstantColorShader_Type); @@ -115,11 +104,6 @@ int StrokeShader_Init(PyObject *module) PyModule_AddObject(module, "ConstrainedIncreasingThicknessShader", (PyObject *)&ConstrainedIncreasingThicknessShader_Type); - if (PyType_Ready(&fstreamShader_Type) < 0) - return -1; - Py_INCREF(&fstreamShader_Type); - PyModule_AddObject(module, "fstreamShader", (PyObject *)&fstreamShader_Type); - if (PyType_Ready(&GuidingLinesShader_Type) < 0) return -1; Py_INCREF(&GuidingLinesShader_Type); @@ -155,36 +139,16 @@ int StrokeShader_Init(PyObject *module) Py_INCREF(&SpatialNoiseShader_Type); PyModule_AddObject(module, "SpatialNoiseShader", (PyObject *)&SpatialNoiseShader_Type); - if (PyType_Ready(&streamShader_Type) < 0) - return -1; - Py_INCREF(&streamShader_Type); - PyModule_AddObject(module, "streamShader", (PyObject *)&streamShader_Type); - - if (PyType_Ready(&StrokeTextureShader_Type) < 0) - return -1; - Py_INCREF(&StrokeTextureShader_Type); - PyModule_AddObject(module, "StrokeTextureShader", (PyObject *)&StrokeTextureShader_Type); - if (PyType_Ready(&StrokeTextureStepShader_Type) < 0) return -1; Py_INCREF(&StrokeTextureStepShader_Type); PyModule_AddObject(module, "StrokeTextureStepShader", (PyObject *)&StrokeTextureStepShader_Type); - if (PyType_Ready(&TextureAssignerShader_Type) < 0) - return -1; - Py_INCREF(&TextureAssignerShader_Type); - PyModule_AddObject(module, "TextureAssignerShader", (PyObject *)&TextureAssignerShader_Type); - if (PyType_Ready(&ThicknessNoiseShader_Type) < 0) return -1; Py_INCREF(&ThicknessNoiseShader_Type); PyModule_AddObject(module, "ThicknessNoiseShader", (PyObject *)&ThicknessNoiseShader_Type); - if (PyType_Ready(&ThicknessVariationPatternShader_Type) < 0) - return -1; - Py_INCREF(&ThicknessVariationPatternShader_Type); - PyModule_AddObject(module, "ThicknessVariationPatternShader", (PyObject *)&ThicknessVariationPatternShader_Type); - if (PyType_Ready(&TipRemoverShader_Type) < 0) return -1; Py_INCREF(&TipRemoverShader_Type); |