Merged changes in the trunk up to revision 40520.
authorTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Sat, 24 Sep 2011 21:39:11 +0000 (21:39 +0000)
committerTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Sat, 24 Sep 2011 21:39:11 +0000 (21:39 +0000)
15 files changed:
1  2 
release/scripts/startup/bl_operators/__init__.py
release/scripts/startup/bl_ui/properties_render.py
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/writefile.c
source/blender/editors/interface/interface_templates.c
source/blender/editors/transform/transform.c
source/blender/makesrna/intern/makesrna.c
source/blender/makesrna/intern/rna_ID.c
source/blender/makesrna/intern/rna_action.c
source/blender/python/SConscript
source/blender/python/intern/CMakeLists.txt
source/blender/render/intern/source/shadeinput.c
source/blender/render/intern/source/shadeoutput.c
source/blenderplayer/bad_level_call_stubs/stubs.c
source/creator/creator.c

index 539915268446b42a16dc8c03d371b522aed84428,c0e83cee9d685c4c09a6d9efe865518705dfd2cf..c1af1e8ab5e6a6126f4dfcb82145c1198036adbb
@@@ -24,11 -24,10 +24,11 @@@ if "bpy" in locals()
          _reload(val)
  _modules = (
      "add_mesh_torus",
-     "animsys_update",
+     "anim",
+     "console",
 +    "freestyle",
      "image",
      "mesh",
-     "nla",
      "object_align",
      "object",
      "object_randomize_transform",
index f6586d105a55bc1ccce7f3b7c1c782c652304e66,815f0a7757074ae888207ae6f956c74d4f1ec5d2..57b5c9d848a590d1ea99a23de6707ee03213e2e2
@@@ -826,14 -395,9 +825,14 @@@ class RENDER_PT_post_processing(RenderB
          col.prop(rd, "use_edge_enhance")
          sub = col.column()
          sub.active = rd.use_edge_enhance
-         sub.prop(rd, "edge_threshold", text=_("Threshold"), slider=True)
+         sub.prop(rd, "edge_threshold", text="Threshold", slider=True)
          sub.prop(rd, "edge_color", text="")
  
 +        layout.separator()
 +
 +        split = layout.split()
 +        col = split.column()
 +        col.prop(rd, "use_freestyle", text="Freestyle")
  
  class RENDER_PT_stamp(RenderButtonsPanel, Panel):
      bl_label = "Stamp"
Simple merge
Simple merge