Merged changes in the trunk up to revision 26976.

diff --cc release/scripts/ui/properties_render.py
index 7693253a2d24f1e49115b17defe664251b9ed105,75123311c41495c32248d5ca676271e0c6cbdd6f..766c85fdbcbf90838486c8e9dd796b76eab844aa
--- 1/release/scripts/ui/properties_render.py
--- 2/release/scripts/ui/properties_render.py
+++ b/release/scripts/ui/properties_render.py
@@@ -657,17 -623,33 +657,33 @@@ class RENDER_PT_bake(RenderButtonsPanel
          sub.prop(rd, "bake_distance")
          sub.prop(rd, "bake_bias")
  
 -
 +        
- bpy.types.register(RENDER_MT_presets)
- bpy.types.register(RENDER_PT_render)
- bpy.types.register(RENDER_PT_layers)
- bpy.types.register(RENDER_PT_dimensions)
- bpy.types.register(RENDER_PT_antialiasing)
- bpy.types.register(RENDER_PT_motion_blur)
- bpy.types.register(RENDER_PT_shading)
- bpy.types.register(RENDER_PT_output)
- bpy.types.register(RENDER_PT_encoding)
- bpy.types.register(RENDER_PT_performance)
- bpy.types.register(RENDER_PT_post_processing)
- bpy.types.register(RENDER_PT_stamp)
- bpy.types.register(RENDER_PT_bake)
+ classes = [
+     RENDER_MT_presets,
+     RENDER_PT_render,
+     RENDER_PT_layers,
+     RENDER_PT_dimensions,
+     RENDER_PT_antialiasing,
+     RENDER_PT_motion_blur,
+     RENDER_PT_shading,
+     RENDER_PT_output,
+     RENDER_PT_encoding,
+     RENDER_PT_performance,
+     RENDER_PT_post_processing,
+     RENDER_PT_stamp,
+     RENDER_PT_bake]
+ 
+ 
+ def register():
+     register = bpy.types.register
+     for cls in classes:
+         register(cls)
+ 
+ def unregister():
+     unregister = bpy.types.unregister
+     for cls in classes:
+         unregister(cls)
+ 
+ if __name__ == "__main__":
+     register()
+ 

diff --cc release/scripts/ui/space_userpref.py
Simple merge

diff --cc source/blender/blenkernel/intern/material.c
Simple merge

diff --cc source/blender/blenloader/intern/readfile.c
Simple merge

diff --cc source/blender/blenloader/intern/writefile.c
Simple merge

diff --cc source/blender/editors/render/render_shading.c
Simple merge

diff --cc source/blender/editors/screen/screen_ops.c
Simple merge

diff --cc source/blender/editors/transform/transform.c
Simple merge

diff --cc source/blender/makesdna/intern/makesdna.c
Simple merge

diff --cc source/blender/makesrna/RNA_access.h
Simple merge

diff --cc source/blender/makesrna/intern/rna_scene.c
Simple merge

diff --cc source/blender/python/intern/bpy.c
index de46aa71af96ede8ceaee1b96ce3d5b9e8e1feb0,43accf939aa02903ea8b7f792206fd493037c4e8..5f94966b416bf07e1a1f62f447038f5f287979bc
--- 1/source/blender/python/intern/bpy.c
--- 2/source/blender/python/intern/bpy.c
+++ b/source/blender/python/intern/bpy.c
@@@ -40,10 -40,15 +40,17 @@@
  #include "../generic/BGL.h"
  #include "../generic/IDProp.h"
  
-  
- /* todo, make nice syntax for sphinx */
- static char bpy_home_paths_doc[] = "home_paths(subfolder), return 3 paths to blender home directories (system, local, user), strings will be empty when not found.";
 +#include "BPy_Freestyle.h"
++
+ static char bpy_home_paths_doc[] =
+ ".. function:: home_paths(subfolder)\n"
+ "\n"
+ "   return 3 paths to blender home directories.\n"
+ "\n"
+ "   :arg subfolder: The name of a subfolder to find within the blenders home directory.\n"
+ "   :type subfolder: string\n"
+ "   :return: (system, local, user) strings will be empty when not found.\n"
+ "   :rtype: tuple of strigs\n";
  
  PyObject *bpy_home_paths(PyObject *self, PyObject *args)
  {

diff --cc source/blender/render/intern/source/shadeoutput.c
Simple merge

diff --cc source/creator/creator.c
Simple merge