From 2212564f1804e3cc866003b226eac89575d53ade Mon Sep 17 00:00:00 2001 From: Tamito Kajiyama Date: Sun, 23 May 2010 12:10:31 +0000 Subject: Fixed invalid use of PyUnicode_FromFormat() where PyUnicode_FromString() should have been used. --- source/blender/freestyle/intern/python/BPy_BinaryPredicate0D.cpp | 2 +- source/blender/freestyle/intern/python/BPy_BinaryPredicate1D.cpp | 2 +- source/blender/freestyle/intern/python/BPy_Interface0D.cpp | 2 +- source/blender/freestyle/intern/python/BPy_Interface1D.cpp | 2 +- source/blender/freestyle/intern/python/BPy_Iterator.cpp | 2 +- source/blender/freestyle/intern/python/BPy_StrokeAttribute.cpp | 2 +- source/blender/freestyle/intern/python/BPy_StrokeShader.cpp | 2 +- source/blender/freestyle/intern/python/BPy_UnaryFunction0D.cpp | 2 +- source/blender/freestyle/intern/python/BPy_UnaryFunction1D.cpp | 2 +- source/blender/freestyle/intern/python/BPy_UnaryPredicate0D.cpp | 2 +- source/blender/freestyle/intern/python/BPy_UnaryPredicate1D.cpp | 2 +- .../intern/python/UnaryFunction0D/BPy_UnaryFunction0DDouble.cpp | 2 +- .../intern/python/UnaryFunction0D/BPy_UnaryFunction0DEdgeNature.cpp | 2 +- .../intern/python/UnaryFunction0D/BPy_UnaryFunction0DFloat.cpp | 2 +- .../freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DId.cpp | 2 +- .../intern/python/UnaryFunction0D/BPy_UnaryFunction0DMaterial.cpp | 2 +- .../intern/python/UnaryFunction0D/BPy_UnaryFunction0DUnsigned.cpp | 2 +- .../intern/python/UnaryFunction0D/BPy_UnaryFunction0DVec2f.cpp | 2 +- .../intern/python/UnaryFunction0D/BPy_UnaryFunction0DVec3f.cpp | 2 +- .../python/UnaryFunction0D/BPy_UnaryFunction0DVectorViewShape.cpp | 2 +- .../intern/python/UnaryFunction0D/BPy_UnaryFunction0DViewShape.cpp | 2 +- .../intern/python/UnaryFunction1D/BPy_UnaryFunction1DDouble.cpp | 2 +- .../intern/python/UnaryFunction1D/BPy_UnaryFunction1DEdgeNature.cpp | 2 +- .../intern/python/UnaryFunction1D/BPy_UnaryFunction1DFloat.cpp | 2 +- .../intern/python/UnaryFunction1D/BPy_UnaryFunction1DUnsigned.cpp | 2 +- .../intern/python/UnaryFunction1D/BPy_UnaryFunction1DVec2f.cpp | 2 +- .../intern/python/UnaryFunction1D/BPy_UnaryFunction1DVec3f.cpp | 2 +- .../python/UnaryFunction1D/BPy_UnaryFunction1DVectorViewShape.cpp | 2 +- .../freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVoid.cpp | 2 +- 29 files changed, 29 insertions(+), 29 deletions(-) (limited to 'source/blender/freestyle/intern') diff --git a/source/blender/freestyle/intern/python/BPy_BinaryPredicate0D.cpp b/source/blender/freestyle/intern/python/BPy_BinaryPredicate0D.cpp index 4bc8a0cb8bb..c693bb0ca3b 100644 --- a/source/blender/freestyle/intern/python/BPy_BinaryPredicate0D.cpp +++ b/source/blender/freestyle/intern/python/BPy_BinaryPredicate0D.cpp @@ -81,7 +81,7 @@ static char BinaryPredicate0D_getName___doc__[] = static PyObject * BinaryPredicate0D_getName( BPy_BinaryPredicate0D *self, PyObject *args) { - return PyUnicode_FromFormat( self->bp0D->getName().c_str() ); + return PyUnicode_FromString( self->bp0D->getName().c_str() ); } static PyObject * BinaryPredicate0D___call__( BPy_BinaryPredicate0D *self, PyObject *args, PyObject *kwds) diff --git a/source/blender/freestyle/intern/python/BPy_BinaryPredicate1D.cpp b/source/blender/freestyle/intern/python/BPy_BinaryPredicate1D.cpp index 30c63e73630..ebbd9714e46 100644 --- a/source/blender/freestyle/intern/python/BPy_BinaryPredicate1D.cpp +++ b/source/blender/freestyle/intern/python/BPy_BinaryPredicate1D.cpp @@ -110,7 +110,7 @@ static char BinaryPredicate1D_getName___doc__[] = static PyObject *BinaryPredicate1D_getName( BPy_BinaryPredicate1D *self, PyObject *args) { - return PyUnicode_FromFormat( self->bp1D->getName().c_str() ); + return PyUnicode_FromString( self->bp1D->getName().c_str() ); } static PyObject *BinaryPredicate1D___call__( BPy_BinaryPredicate1D *self, PyObject *args, PyObject *kwds) diff --git a/source/blender/freestyle/intern/python/BPy_Interface0D.cpp b/source/blender/freestyle/intern/python/BPy_Interface0D.cpp index adf26def931..114d9bfa10a 100644 --- a/source/blender/freestyle/intern/python/BPy_Interface0D.cpp +++ b/source/blender/freestyle/intern/python/BPy_Interface0D.cpp @@ -99,7 +99,7 @@ static char Interface0D_getExactTypeName___doc__[] = " :rtype: string\n"; static PyObject *Interface0D_getExactTypeName( BPy_Interface0D *self ) { - return PyUnicode_FromFormat( self->if0D->getExactTypeName().c_str() ); + return PyUnicode_FromString( self->if0D->getExactTypeName().c_str() ); } static char Interface0D_getX___doc__[] = diff --git a/source/blender/freestyle/intern/python/BPy_Interface1D.cpp b/source/blender/freestyle/intern/python/BPy_Interface1D.cpp index 3b5924464fe..6e2d8c65d1a 100644 --- a/source/blender/freestyle/intern/python/BPy_Interface1D.cpp +++ b/source/blender/freestyle/intern/python/BPy_Interface1D.cpp @@ -109,7 +109,7 @@ static char Interface1D_getExactTypeName___doc__[] = " :rtype: string\n"; static PyObject *Interface1D_getExactTypeName( BPy_Interface1D *self ) { - return PyUnicode_FromFormat( self->if1D->getExactTypeName().c_str() ); + return PyUnicode_FromString( self->if1D->getExactTypeName().c_str() ); } #if 0 diff --git a/source/blender/freestyle/intern/python/BPy_Iterator.cpp b/source/blender/freestyle/intern/python/BPy_Iterator.cpp index 83601c05b1a..2fe5a3010d2 100644 --- a/source/blender/freestyle/intern/python/BPy_Iterator.cpp +++ b/source/blender/freestyle/intern/python/BPy_Iterator.cpp @@ -110,7 +110,7 @@ static char Iterator_getExactTypeName___doc__[] = " :rtype: string\n"; static PyObject * Iterator_getExactTypeName(BPy_Iterator* self) { - return PyUnicode_FromFormat( self->it->getExactTypeName().c_str() ); + return PyUnicode_FromString( self->it->getExactTypeName().c_str() ); } static char Iterator_increment___doc__[] = diff --git a/source/blender/freestyle/intern/python/BPy_StrokeAttribute.cpp b/source/blender/freestyle/intern/python/BPy_StrokeAttribute.cpp index 4db7110ac29..3d4ec47c6f7 100644 --- a/source/blender/freestyle/intern/python/BPy_StrokeAttribute.cpp +++ b/source/blender/freestyle/intern/python/BPy_StrokeAttribute.cpp @@ -125,7 +125,7 @@ static PyObject * StrokeAttribute___repr__(BPy_StrokeAttribute* self) << " - R: " << self->sa->getThicknessR() << " L: " << self->sa->getThicknessL(); - return PyUnicode_FromFormat( repr.str().c_str() ); + return PyUnicode_FromString( repr.str().c_str() ); } diff --git a/source/blender/freestyle/intern/python/BPy_StrokeShader.cpp b/source/blender/freestyle/intern/python/BPy_StrokeShader.cpp index 820f029223f..c28025227ff 100644 --- a/source/blender/freestyle/intern/python/BPy_StrokeShader.cpp +++ b/source/blender/freestyle/intern/python/BPy_StrokeShader.cpp @@ -209,7 +209,7 @@ static char StrokeShader_getName___doc__[] = static PyObject * StrokeShader_getName( BPy_StrokeShader *self, PyObject *args) { - return PyUnicode_FromFormat( self->ss->getName().c_str() ); + return PyUnicode_FromString( self->ss->getName().c_str() ); } static char StrokeShader_shade___doc__[] = diff --git a/source/blender/freestyle/intern/python/BPy_UnaryFunction0D.cpp b/source/blender/freestyle/intern/python/BPy_UnaryFunction0D.cpp index b254786897c..9cb855f32ae 100644 --- a/source/blender/freestyle/intern/python/BPy_UnaryFunction0D.cpp +++ b/source/blender/freestyle/intern/python/BPy_UnaryFunction0D.cpp @@ -73,7 +73,7 @@ static void UnaryFunction0D___dealloc__(BPy_UnaryFunction0D* self) static PyObject * UnaryFunction0D___repr__(BPy_UnaryFunction0D* self) { - return PyUnicode_FromFormat("UnaryFunction0D"); + return PyUnicode_FromString("UnaryFunction0D"); } /*-----------------------BPy_UnaryFunction0D type definition ------------------------------*/ diff --git a/source/blender/freestyle/intern/python/BPy_UnaryFunction1D.cpp b/source/blender/freestyle/intern/python/BPy_UnaryFunction1D.cpp index a9ca73003f5..f4de9edb962 100644 --- a/source/blender/freestyle/intern/python/BPy_UnaryFunction1D.cpp +++ b/source/blender/freestyle/intern/python/BPy_UnaryFunction1D.cpp @@ -64,7 +64,7 @@ static void UnaryFunction1D___dealloc__(BPy_UnaryFunction1D* self) static PyObject * UnaryFunction1D___repr__(BPy_UnaryFunction1D* self) { - return PyUnicode_FromFormat("UnaryFunction1D"); + return PyUnicode_FromString("UnaryFunction1D"); } /*-----------------------BPy_UnaryFunction1D type definition ------------------------------*/ diff --git a/source/blender/freestyle/intern/python/BPy_UnaryPredicate0D.cpp b/source/blender/freestyle/intern/python/BPy_UnaryPredicate0D.cpp index 9de3c5cc389..6796919a032 100644 --- a/source/blender/freestyle/intern/python/BPy_UnaryPredicate0D.cpp +++ b/source/blender/freestyle/intern/python/BPy_UnaryPredicate0D.cpp @@ -90,7 +90,7 @@ static char UnaryPredicate0D_getName___doc__[] = static PyObject * UnaryPredicate0D_getName( BPy_UnaryPredicate0D *self ) { - return PyUnicode_FromFormat( self->up0D->getName().c_str() ); + return PyUnicode_FromString( self->up0D->getName().c_str() ); } static PyObject * UnaryPredicate0D___call__( BPy_UnaryPredicate0D *self, PyObject *args, PyObject *kwds) diff --git a/source/blender/freestyle/intern/python/BPy_UnaryPredicate1D.cpp b/source/blender/freestyle/intern/python/BPy_UnaryPredicate1D.cpp index 8f68bba17b1..ba69f407689 100644 --- a/source/blender/freestyle/intern/python/BPy_UnaryPredicate1D.cpp +++ b/source/blender/freestyle/intern/python/BPy_UnaryPredicate1D.cpp @@ -136,7 +136,7 @@ static char UnaryPredicate1D_getName___doc__[] = static PyObject * UnaryPredicate1D_getName( BPy_UnaryPredicate1D *self, PyObject *args) { - return PyUnicode_FromFormat( self->up1D->getName().c_str() ); + return PyUnicode_FromString( self->up1D->getName().c_str() ); } static PyObject * UnaryPredicate1D___call__( BPy_UnaryPredicate1D *self, PyObject *args, PyObject *kwds) diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DDouble.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DDouble.cpp index a6810d0a7c5..fc906475694 100644 --- a/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DDouble.cpp +++ b/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DDouble.cpp @@ -128,7 +128,7 @@ static char UnaryFunction0DDouble_getName___doc__[] = static PyObject * UnaryFunction0DDouble_getName( BPy_UnaryFunction0DDouble *self ) { - return PyUnicode_FromFormat( self->uf0D_double->getName().c_str() ); + return PyUnicode_FromString( self->uf0D_double->getName().c_str() ); } static PyObject * UnaryFunction0DDouble___call__( BPy_UnaryFunction0DDouble *self, PyObject *args, PyObject *kwds) diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DEdgeNature.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DEdgeNature.cpp index aa2ae5e36b5..5ecaa5730f6 100644 --- a/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DEdgeNature.cpp +++ b/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DEdgeNature.cpp @@ -72,7 +72,7 @@ static char UnaryFunction0DEdgeNature_getName___doc__[] = static PyObject * UnaryFunction0DEdgeNature_getName( BPy_UnaryFunction0DEdgeNature *self ) { - return PyUnicode_FromFormat( self->uf0D_edgenature->getName().c_str() ); + return PyUnicode_FromString( self->uf0D_edgenature->getName().c_str() ); } static PyObject * UnaryFunction0DEdgeNature___call__( BPy_UnaryFunction0DEdgeNature *self, PyObject *args, PyObject *kwds) diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DFloat.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DFloat.cpp index ade1082cf64..89ad444b832 100644 --- a/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DFloat.cpp +++ b/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DFloat.cpp @@ -102,7 +102,7 @@ static char UnaryFunction0DFloat_getName___doc__[] = static PyObject * UnaryFunction0DFloat_getName( BPy_UnaryFunction0DFloat *self ) { - return PyUnicode_FromFormat( self->uf0D_float->getName().c_str() ); + return PyUnicode_FromString( self->uf0D_float->getName().c_str() ); } static PyObject * UnaryFunction0DFloat___call__( BPy_UnaryFunction0DFloat *self, PyObject *args, PyObject *kwds) diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DId.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DId.cpp index a29eabcc063..fbf97baa0e4 100644 --- a/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DId.cpp +++ b/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DId.cpp @@ -72,7 +72,7 @@ static char UnaryFunction0DId_getName___doc__[] = static PyObject * UnaryFunction0DId_getName( BPy_UnaryFunction0DId *self ) { - return PyUnicode_FromFormat( self->uf0D_id->getName().c_str() ); + return PyUnicode_FromString( self->uf0D_id->getName().c_str() ); } static PyObject * UnaryFunction0DId___call__( BPy_UnaryFunction0DId *self, PyObject *args, PyObject *kwds) diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DMaterial.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DMaterial.cpp index 818af164a99..a07da518c41 100644 --- a/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DMaterial.cpp +++ b/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DMaterial.cpp @@ -73,7 +73,7 @@ static char UnaryFunction0DMaterial_getName___doc__[] = static PyObject * UnaryFunction0DMaterial_getName( BPy_UnaryFunction0DMaterial *self ) { - return PyUnicode_FromFormat( self->uf0D_material->getName().c_str() ); + return PyUnicode_FromString( self->uf0D_material->getName().c_str() ); } static PyObject * UnaryFunction0DMaterial___call__( BPy_UnaryFunction0DMaterial *self, PyObject *args, PyObject *kwds) diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DUnsigned.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DUnsigned.cpp index ddf42e7851d..73ece629639 100644 --- a/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DUnsigned.cpp +++ b/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DUnsigned.cpp @@ -72,7 +72,7 @@ static char UnaryFunction0DUnsigned_getName___doc__[] = static PyObject * UnaryFunction0DUnsigned_getName( BPy_UnaryFunction0DUnsigned *self ) { - return PyUnicode_FromFormat( self->uf0D_unsigned->getName().c_str() ); + return PyUnicode_FromString( self->uf0D_unsigned->getName().c_str() ); } static PyObject * UnaryFunction0DUnsigned___call__( BPy_UnaryFunction0DUnsigned *self, PyObject *args, PyObject *kwds) diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DVec2f.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DVec2f.cpp index faca476f319..bdd9ca5db2b 100644 --- a/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DVec2f.cpp +++ b/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DVec2f.cpp @@ -78,7 +78,7 @@ static char UnaryFunction0DVec2f_getName___doc__[] = static PyObject * UnaryFunction0DVec2f_getName( BPy_UnaryFunction0DVec2f *self ) { - return PyUnicode_FromFormat( self->uf0D_vec2f->getName().c_str() ); + return PyUnicode_FromString( self->uf0D_vec2f->getName().c_str() ); } static PyObject * UnaryFunction0DVec2f___call__( BPy_UnaryFunction0DVec2f *self, PyObject *args, PyObject *kwds) diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DVec3f.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DVec3f.cpp index f329007fd70..0f99299b47e 100644 --- a/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DVec3f.cpp +++ b/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DVec3f.cpp @@ -72,7 +72,7 @@ static char UnaryFunction0DVec3f_getName___doc__[] = static PyObject * UnaryFunction0DVec3f_getName( BPy_UnaryFunction0DVec3f *self ) { - return PyUnicode_FromFormat( self->uf0D_vec3f->getName().c_str() ); + return PyUnicode_FromString( self->uf0D_vec3f->getName().c_str() ); } static PyObject * UnaryFunction0DVec3f___call__( BPy_UnaryFunction0DVec3f *self, PyObject *args, PyObject *kwds) diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DVectorViewShape.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DVectorViewShape.cpp index 351935141c5..c0c3f700b65 100644 --- a/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DVectorViewShape.cpp +++ b/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DVectorViewShape.cpp @@ -73,7 +73,7 @@ static char UnaryFunction0DVectorViewShape_getName___doc__[] = static PyObject * UnaryFunction0DVectorViewShape_getName( BPy_UnaryFunction0DVectorViewShape *self ) { - return PyUnicode_FromFormat( self->uf0D_vectorviewshape->getName().c_str() ); + return PyUnicode_FromString( self->uf0D_vectorviewshape->getName().c_str() ); } static PyObject * UnaryFunction0DVectorViewShape___call__( BPy_UnaryFunction0DVectorViewShape *self, PyObject *args, PyObject *kwds) diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DViewShape.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DViewShape.cpp index e3e8538009d..a51969dedc6 100644 --- a/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DViewShape.cpp +++ b/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DViewShape.cpp @@ -78,7 +78,7 @@ static char UnaryFunction0DViewShape_getName___doc__[] = static PyObject * UnaryFunction0DViewShape_getName( BPy_UnaryFunction0DViewShape *self ) { - return PyUnicode_FromFormat( self->uf0D_viewshape->getName().c_str() ); + return PyUnicode_FromString( self->uf0D_viewshape->getName().c_str() ); } static PyObject * UnaryFunction0DViewShape___call__( BPy_UnaryFunction0DViewShape *self, PyObject *args, PyObject *kwds) diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DDouble.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DDouble.cpp index 7721b35b2a8..ce9f28719f1 100644 --- a/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DDouble.cpp +++ b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DDouble.cpp @@ -169,7 +169,7 @@ static char UnaryFunction1DDouble_getName___doc__[] = static PyObject * UnaryFunction1DDouble_getName( BPy_UnaryFunction1DDouble *self ) { - return PyUnicode_FromFormat( self->uf1D_double->getName().c_str() ); + return PyUnicode_FromString( self->uf1D_double->getName().c_str() ); } static PyObject * UnaryFunction1DDouble___call__( BPy_UnaryFunction1DDouble *self, PyObject *args, PyObject *kwds) diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DEdgeNature.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DEdgeNature.cpp index 9cff857cdbe..08f78e2f83e 100644 --- a/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DEdgeNature.cpp +++ b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DEdgeNature.cpp @@ -90,7 +90,7 @@ static char UnaryFunction1DEdgeNature_getName___doc__[] = static PyObject * UnaryFunction1DEdgeNature_getName( BPy_UnaryFunction1DEdgeNature *self ) { - return PyUnicode_FromFormat( self->uf1D_edgenature->getName().c_str() ); + return PyUnicode_FromString( self->uf1D_edgenature->getName().c_str() ); } static PyObject * UnaryFunction1DEdgeNature___call__( BPy_UnaryFunction1DEdgeNature *self, PyObject *args, PyObject *kwds) diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DFloat.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DFloat.cpp index ff20ee6d7c4..f7086335038 100644 --- a/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DFloat.cpp +++ b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DFloat.cpp @@ -83,7 +83,7 @@ static char UnaryFunction1DFloat_getName___doc__[] = static PyObject * UnaryFunction1DFloat_getName( BPy_UnaryFunction1DFloat *self ) { - return PyUnicode_FromFormat( self->uf1D_float->getName().c_str() ); + return PyUnicode_FromString( self->uf1D_float->getName().c_str() ); } static PyObject * UnaryFunction1DFloat___call__( BPy_UnaryFunction1DFloat *self, PyObject *args, PyObject *kwds) diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DUnsigned.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DUnsigned.cpp index bbdfd8dc4f2..7cd37c25552 100644 --- a/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DUnsigned.cpp +++ b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DUnsigned.cpp @@ -90,7 +90,7 @@ static char UnaryFunction1DUnsigned_getName___doc__[] = static PyObject * UnaryFunction1DUnsigned_getName( BPy_UnaryFunction1DUnsigned *self ) { - return PyUnicode_FromFormat( self->uf1D_unsigned->getName().c_str() ); + return PyUnicode_FromString( self->uf1D_unsigned->getName().c_str() ); } static PyObject * UnaryFunction1DUnsigned___call__( BPy_UnaryFunction1DUnsigned *self, PyObject *args, PyObject *kwds) diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVec2f.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVec2f.cpp index 1847c72bbeb..fd3e4c9ea91 100644 --- a/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVec2f.cpp +++ b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVec2f.cpp @@ -96,7 +96,7 @@ static char UnaryFunction1DVec2f_getName___doc__[] = static PyObject * UnaryFunction1DVec2f_getName( BPy_UnaryFunction1DVec2f *self ) { - return PyUnicode_FromFormat( self->uf1D_vec2f->getName().c_str() ); + return PyUnicode_FromString( self->uf1D_vec2f->getName().c_str() ); } static PyObject * UnaryFunction1DVec2f___call__( BPy_UnaryFunction1DVec2f *self, PyObject *args, PyObject *kwds) diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVec3f.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVec3f.cpp index ae31fd5c9fd..55c8f3c7926 100644 --- a/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVec3f.cpp +++ b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVec3f.cpp @@ -90,7 +90,7 @@ static char UnaryFunction1DVec3f_getName___doc__[] = PyObject * UnaryFunction1DVec3f_getName( BPy_UnaryFunction1DVec3f *self ) { - return PyUnicode_FromFormat( self->uf1D_vec3f->getName().c_str() ); + return PyUnicode_FromString( self->uf1D_vec3f->getName().c_str() ); } PyObject * UnaryFunction1DVec3f___call__( BPy_UnaryFunction1DVec3f *self, PyObject *args, PyObject *kwds) diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVectorViewShape.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVectorViewShape.cpp index 4a0787e24cc..6493bcb13fb 100644 --- a/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVectorViewShape.cpp +++ b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVectorViewShape.cpp @@ -103,7 +103,7 @@ static char UnaryFunction1DVectorViewShape_getName___doc__[] = static PyObject * UnaryFunction1DVectorViewShape_getName( BPy_UnaryFunction1DVectorViewShape *self ) { - return PyUnicode_FromFormat( self->uf1D_vectorviewshape->getName().c_str() ); + return PyUnicode_FromString( self->uf1D_vectorviewshape->getName().c_str() ); } static PyObject * UnaryFunction1DVectorViewShape___call__( BPy_UnaryFunction1DVectorViewShape *self, PyObject *args, PyObject *kwds) diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVoid.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVoid.cpp index ddc75d34462..ceb20f512aa 100644 --- a/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVoid.cpp +++ b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVoid.cpp @@ -103,7 +103,7 @@ static char UnaryFunction1DVoid_getName___doc__[] = static PyObject * UnaryFunction1DVoid_getName( BPy_UnaryFunction1DVoid *self ) { - return PyUnicode_FromFormat( self->uf1D_void->getName().c_str() ); + return PyUnicode_FromString( self->uf1D_void->getName().c_str() ); } static PyObject * UnaryFunction1DVoid___call__( BPy_UnaryFunction1DVoid *self, PyObject *args, PyObject *kwds) -- cgit v1.2.3