diff options
-rw-r--r-- | build_files/cmake/Modules/FindOpenCOLLADA.cmake | 5 | ||||
-rw-r--r-- | source/blender/python/intern/bpy_rna.c | 4 |
2 files changed, 6 insertions, 3 deletions
diff --git a/build_files/cmake/Modules/FindOpenCOLLADA.cmake b/build_files/cmake/Modules/FindOpenCOLLADA.cmake index 0c8d8c8d841..77c8b09c4ac 100644 --- a/build_files/cmake/Modules/FindOpenCOLLADA.cmake +++ b/build_files/cmake/Modules/FindOpenCOLLADA.cmake @@ -53,10 +53,11 @@ SET(_opencollada_FIND_COMPONENTS ) # Fedora openCOLLADA package links these statically +# note that order is important here ot it wont link SET(_opencollada_FIND_STATIC_COMPONENTS - UTF - ftoa buffer + ftoa + UTF ) SET(_opencollada_SEARCH_DIRS diff --git a/source/blender/python/intern/bpy_rna.c b/source/blender/python/intern/bpy_rna.c index c4ef866722d..76dcf9729ca 100644 --- a/source/blender/python/intern/bpy_rna.c +++ b/source/blender/python/intern/bpy_rna.c @@ -85,7 +85,9 @@ static PyObject* pyrna_struct_Subtype(PointerRNA *ptr); static PyObject *pyrna_prop_collection_values(BPy_PropertyRNA *self); #define BPY_DOC_ID_PROP_TYPE_NOTE \ -" .. note:: Only :class:`bpy.types.ID`, :class:`bpy.types.Bone` and \n" \ +" .. note::\n" \ +"\n" \ +" Only :class:`bpy.types.ID`, :class:`bpy.types.Bone` and \n" \ " :class:`bpy.types.PoseBone` classes support custom properties.\n" |