archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

correct collada lib linking order (wasnt building for me), and sphinx doc syntax warning.

Browse Source
This commit is contained in:
Campbell Barton
2011-10-13 14:10:38 +00:00
parent 05b47c28fa
commit fa3b4e1830
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
build_files/cmake/Modules/FindOpenCOLLADA.cmake
View File

@@ -53,10 +53,11 @@ SET(_opencollada_FIND_COMPONENTS
) )
# Fedora openCOLLADA package links these statically # Fedora openCOLLADA package links these statically
# note that order is important here ot it wont link
SET(_opencollada_FIND_STATIC_COMPONENTS SET(_opencollada_FIND_STATIC_COMPONENTS
UTF
ftoa
buffer buffer
ftoa
UTF
) )
SET(_opencollada_SEARCH_DIRS SET(_opencollada_SEARCH_DIRS

4
source/blender/python/intern/bpy_rna.c
View File

@@ -85,7 +85,9 @@ static PyObject* pyrna_struct_Subtype(PointerRNA *ptr);
static PyObject *pyrna_prop_collection_values(BPy_PropertyRNA *self); static PyObject *pyrna_prop_collection_values(BPy_PropertyRNA *self);
#define BPY_DOC_ID_PROP_TYPE_NOTE \ #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" " :class:`bpy.types.PoseBone` classes support custom properties.\n"