correct collada lib linking order (wasnt building for me), and sphinx doc syntax...
authorCampbell Barton <ideasman42@gmail.com>
Thu, 13 Oct 2011 14:10:38 +0000 (14:10 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Thu, 13 Oct 2011 14:10:38 +0000 (14:10 +0000)
build_files/cmake/Modules/FindOpenCOLLADA.cmake
source/blender/python/intern/bpy_rna.c

index 0c8d8c8d8419331670d9c7f6461bcea55568ae6b..77c8b09c4ac7102fcd6c65e51145044f6a937678 100644 (file)
@@ -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
index c4ef866722db162e2e7ef909e6a8460bc5c700b0..76dcf9729ca57bce4fccb93b514aa0638f459fa2 100644 (file)
@@ -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"