[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [40987] trunk/blender: correct collada lib linking order (wasnt building for me), and sphinx doc syntax warning.

[Campbell Barton]

Revision: 40987
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=40987
Author:   campbellbarton
Date:     2011-10-13 14:10:38 +0000 (Thu, 13 Oct 2011)
Log Message:
-----------
correct collada lib linking order (wasnt building for me), and sphinx doc syntax warning.

Modified Paths:
--------------
    trunk/blender/build_files/cmake/Modules/FindOpenCOLLADA.cmake
    trunk/blender/source/blender/python/intern/bpy_rna.c

Modified: trunk/blender/build_files/cmake/Modules/FindOpenCOLLADA.cmake
===================================================================
--- trunk/blender/build_files/cmake/Modules/FindOpenCOLLADA.cmake	2011-10-13 12:13:56 UTC (rev 40986)
+++ trunk/blender/build_files/cmake/Modules/FindOpenCOLLADA.cmake	2011-10-13 14:10:38 UTC (rev 40987)
@@ -53,10 +53,11 @@
 )
 
 # Fedora openCOLLADA package links these statically
+# note that order is important here ot it wont link
 SET(_opencollada_FIND_STATIC_COMPONENTS
+  buffer
+  ftoa
   UTF
-  ftoa
-  buffer
 )
 
 SET(_opencollada_SEARCH_DIRS

Modified: trunk/blender/source/blender/python/intern/bpy_rna.c
===================================================================
--- trunk/blender/source/blender/python/intern/bpy_rna.c	2011-10-13 12:13:56 UTC (rev 40986)
+++ trunk/blender/source/blender/python/intern/bpy_rna.c	2011-10-13 14:10:38 UTC (rev 40987)
@@ -85,7 +85,9 @@
 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"