Merged changes in the trunk up to revision 32886.
authorTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Fri, 5 Nov 2010 21:49:36 +0000 (21:49 +0000)
committerTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Fri, 5 Nov 2010 21:49:36 +0000 (21:49 +0000)
27 files changed:
1  2 
doc/python_api/sphinx_doc_gen.py
release/scripts/ui/properties_render.py
release/scripts/ui/space_userpref.py
source/blender/blenkernel/CMakeLists.txt
source/blender/blenkernel/SConscript
source/blender/blenkernel/intern/anim_sys.c
source/blender/blenkernel/intern/library.c
source/blender/blenlib/CMakeLists.txt
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/writefile.c
source/blender/editors/interface/interface_templates.c
source/blender/editors/render/render_shading.c
source/blender/editors/space_outliner/outliner.c
source/blender/editors/transform/transform.c
source/blender/editors/transform/transform_orientations.c
source/blender/makesdna/DNA_action_types.h
source/blender/makesrna/RNA_access.h
source/blender/makesrna/SConscript
source/blender/makesrna/intern/CMakeLists.txt
source/blender/python/intern/bpy.c
source/blender/render/CMakeLists.txt
source/blender/render/extern/include/RE_pipeline.h
source/blender/render/intern/include/render_types.h
source/blender/render/intern/source/pipeline.c
source/creator/CMakeLists.txt
source/creator/SConscript
source/creator/creator.c

Simple merge
Simple merge
Simple merge
index b18c2da84373bc874ff431daa55e0f27d82b86f5,ed9907b6869c17122f6d5cf36af130d6f300dd7b..1c75c34e913aec62d0c4358949ba457f115e962b
@@@ -497,8 -492,6 +499,7 @@@ int set_listbasepointers(Main *main, Li
        lb[a++]= &(main->scene);
        lb[a++]= &(main->library);
        lb[a++]= &(main->wm);
-       lb[a++]= &(main->gpencil);
 +      lb[a++]= &(main->linestyle);
        
        lb[a]= NULL;
  
Simple merge
Simple merge
Simple merge
index 9b1f09a7984a4d1bdce67c0fbb44c1d063add06e,3461f1eb65dd9f7bfd973a1fb519720fa1e6001e..b1c4a9951cd0c7226645451813d1a18c3fba1ffb
@@@ -197,14 -195,7 +197,8 @@@ void BPy_init_modules( void 
                printf("bpy: couldnt find 'scripts/modules', blender probably wont start.\n");
        }
        /* stand alone utility modules not related to blender directly */
-       Geometry_Init();
-       Mathutils_Init();
-       Noise_Init();
-       BGL_Init();
-       BLF_Init();
-       IDProp_Init_Types();
-       AUD_initPython();
+       IDProp_Init_Types(); /* not actually a submodule, just types */
 +      Freestyle_Init();
  
        mod = PyModule_New("_bpy");
  
Simple merge
index f0b3ac53343266ed3dd03a8dd12a09805abcd0bf,e093eb8cb656c4ca988e791f70b4b8cb7a319028..e42f707a38eea871f32e05b293bbea38519b6ddb
@@@ -39,10 -39,7 +39,8 @@@ INCLUDE_DIRECTORIES
        ../blender/render/extern/include
        ../blender/makesdna
        ../blender/gpu
 +      ../blender/freestyle
        ../blender/windowmanager
-       ../kernel/gen_messaging
-       ../kernel/gen_system
  )
  
  IF(WIN32)
Simple merge
index a89bef537a90a0dbbb31b7d71792ecac35e290c4,ec0470f0710581d7390951caf74af0acea33442f..46176106026306f41253d2936517e24eb3464619
  #include "GPU_draw.h"
  #include "GPU_extensions.h"
  
 +#include "FRS_freestyle.h"
 +
  /* for passing information between creator and gameengine */
+ #ifdef WITH_GAMEENGINE
+ #include "GEN_messaging.h"
  #include "SYS_System.h"
+ #else /* dummy */
+ #define SYS_SystemHandle int
+ #endif
  
  #include <signal.h>