Cycles: svn merge -r41613:41627 ^/trunk/blender

2011-11-07 17:13:32 +00:00
parent 5ef9039b7e 69ad40f9ea
commit dca15b215d
38 changed files with 156 additions and 511 deletions
--- a/source/blender/python/intern/bpy_interface.c
+++ b/source/blender/python/intern/bpy_interface.c
@@ -187,7 +187,7 @@ static struct _inittab bpy_internal_modules[]= {
 	{(char *)"aud", AUD_initPython},
 #endif
 #ifdef WITH_CYCLES
-	{(char *)"libcycles_blender", CYCLES_initPython},
+	{(char *)"bcycles", CYCLES_initPython},
 #endif
 	{(char *)"gpu", GPU_initPython},
 	{NULL, NULL}