Merged changes in the trunk up to revision 29994.
authorTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Mon, 5 Jul 2010 18:37:29 +0000 (18:37 +0000)
committerTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Mon, 5 Jul 2010 18:37:29 +0000 (18:37 +0000)
21 files changed:
1  2 
release/scripts/ui/properties_render.py
release/scripts/ui/space_userpref.py
source/blender/blenkernel/SConscript
source/blender/blenkernel/intern/library.c
source/blender/blenkernel/intern/scene.c
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/transform/transform.c
source/blender/makesdna/DNA_scene_types.h
source/blender/makesrna/SConscript
source/blender/makesrna/intern/rna_main_api.c
source/blender/makesrna/intern/rna_scene.c
source/blender/python/doc/sphinx_doc_gen.py
source/blender/python/intern/bpy.c
source/blender/render/CMakeLists.txt
source/blender/render/intern/include/render_types.h
source/blender/render/intern/source/pipeline.c
source/creator/CMakeLists.txt
source/creator/creator.c

Simple merge
Simple merge
Simple merge
index 758e495e7ede4a44cceb5b80f63f4ce61d465e41,27524c66c36a2b1abb09f23597a69d13901a2d03..9e667a4b7b2e76c57090a74860a2b5b3df04406b
@@@ -431,12 -451,8 +459,12 @@@ def rna2sphinx(BASEPATH)
      pymodule2sphinx(BASEPATH, "mathutils", module, "Math Types & Utilities (mathutils)")
      del module
  
 +    import Freestyle as module
 +    pymodule2sphinx(BASEPATH, "Freestyle", module, "Freestyle Operators & Rules (Freestyle)")
 +    del module
 +
      import blf as module
-     pymodule2sphinx(BASEPATH, "blf", module, "Blender Font Drawing (blf)")
+     pymodule2sphinx(BASEPATH, "blf", module, "Font Drawing (blf)")
      del module
  
      # game engine
Simple merge
Simple merge
index cea4288f03c59136f1d9adafd4cccbd62b614990,722ce55e9503680783c32ec4456846f161452da3..9033729652ea0affd14ceb994229b8610182b75e
@@@ -1782,13 -1779,10 +1785,15 @@@ static void do_render_3d(Render *re
                if(!re->test_break(re->tbh))
                        add_halo_flare(re);
        
 +      /* Freestyle  */
 +      if( re->r.mode & R_EDGE_FRS && re->r.renderer==R_INTERN)
 +              if(!re->test_break(re->tbh))
 +                      add_freestyle(re);
 +              
        /* free all render verts etc */
        RE_Database_Free(re);
+       
+       re->scene->r.subframe = 0.f;
  }
  
  /* called by blur loop, accumulate RGBA key alpha */
index af3a05adadabe12a5c15ba280db06110507bf82c,05baec55891fee1aa09b23f2e0c926d15fd79b7d..67c77ca41f42ede817ae9b29a15b1f41d556b2b4
@@@ -394,10 -392,7 +393,8 @@@ ENDIF(CMAKE_SYSTEM_NAME MATCHES "Linux"
          bf_editor_animation
          bf_editor_datafiles
  
 +              bf_freestyle
                blender_BSP 
-               bf_ghost 
-               bf_string 
                blender_render 
                blender_ONL 
                bf_python 
Simple merge