Merged changes in the trunk up to revision 27647.
authorTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Sun, 21 Mar 2010 19:55:51 +0000 (19:55 +0000)
committerTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Sun, 21 Mar 2010 19:55:51 +0000 (19:55 +0000)
21 files changed:
1  2 
release/scripts/ui/properties_render.py
release/scripts/ui/space_userpref.py
source/blender/blenkernel/intern/material.c
source/blender/blenkernel/intern/scene.c
source/blender/blenloader/intern/readfile.c
source/blender/editors/render/render_intern.h
source/blender/editors/render/render_ops.c
source/blender/editors/render/render_shading.c
source/blender/editors/space_outliner/outliner.c
source/blender/editors/space_view3d/view3d_edit.c
source/blender/editors/transform/transform.c
source/blender/editors/transform/transform_orientations.c
source/blender/makesdna/DNA_scene_types.h
source/blender/makesrna/RNA_access.h
source/blender/makesrna/intern/rna_scene.c
source/blender/python/intern/bpy.c
source/blender/render/extern/include/RE_pipeline.h
source/blender/render/intern/source/pipeline.c
source/blender/render/intern/source/shadeinput.c
source/blender/render/intern/source/shadeoutput.c
source/creator/creator.c

index ce957e556f883e41487e69e49dcdfd6b7a7399a1,c9795d62f715c54c2b42b8d6f05714de174f1dff..553e6a8b4edf79605b00bec8b7c36d98a70d3129
@@@ -658,9 -633,10 +667,10 @@@ class RENDER_PT_bake(RenderButtonsPanel
          sub.prop(rd, "bake_distance")
          sub.prop(rd, "bake_bias")
  
 -
 +        
  classes = [
      RENDER_MT_presets,
+     RENDER_MT_ffmpeg_presets,
      RENDER_PT_render,
      RENDER_PT_layers,
      RENDER_PT_dimensions,
Simple merge
index 817e97819bbedfd2eb1a42342c8d20b1366ccb78,a5273e06afb9737a9d46d75eeb4833934e7c0373..bae6a1f1c8ad858fa69376876396889ebc1a7343
@@@ -843,8 -843,11 +848,12 @@@ typedef struct Scene 
  #define R_NO_OVERWRITE        0x400000 /* skip existing files */
  #define R_TOUCH                       0x800000 /* touch files before rendering */
  #define R_SIMPLIFY            0x1000000
 +#define R_EDGE_FRS            0x2000000 /* R_EDGE for Freestyle */
  
+ /* seq_flag */
+ #define R_SEQ_GL_PREV 1
+ #define R_SEQ_GL_REND 2
  /* displaymode */
  
  #define R_OUTPUT_SCREEN       0
index 9b762ed930aa03ab11523613ac44a553a0886228,2671f480d3b2b51bd9bcf7de839ba612d5cdc5fc..f9e3b0620b643b4c07fec238479f11c9e79fa058
@@@ -217,8 -217,8 +217,9 @@@ extern StructRNA RNA_FModifierGenerator
  extern StructRNA RNA_FModifierLimits;
  extern StructRNA RNA_FModifierNoise;
  extern StructRNA RNA_FModifierPython;
+ extern StructRNA RNA_FModifierStepped;
  extern StructRNA RNA_FollowPathConstraint;
 +extern StructRNA RNA_FreestyleModuleSettings;
  extern StructRNA RNA_Function;
  extern StructRNA RNA_GameBooleanProperty;
  extern StructRNA RNA_GameFloatProperty;
Simple merge
index 0218f7458cb3ee755adc1d6deb28fd921ef42599,19f6dcfbaa8b8c50a86d06fae8e9969049325db3..09d190b836ff8af2afc94e266f96ab2d814b5b92
@@@ -214,9 -214,8 +214,9 @@@ void RE_init_threadcount(Render *re)
  void RE_TileProcessor(struct Render *re, int firsttile, int threaded);
  
  /* only RE_NewRender() needed, main Blender render calls */
- void RE_BlenderFrame(struct Render *re, struct Scene *scene, struct SceneRenderLayer *srl, int frame);
- void RE_BlenderAnim(struct Render *re, struct Scene *scene, int sfra, int efra, int tfra, struct ReportList *reports);
+ void RE_BlenderFrame(struct Render *re, struct Scene *scene, struct SceneRenderLayer *srl, unsigned int lay, int frame);
+ void RE_BlenderAnim(struct Render *re, struct Scene *scene, unsigned int lay, int sfra, int efra, int tfra, struct ReportList *reports);
 +void RE_RenderFreestyleStrokes(struct Render *re, struct Scene *scene);
  
  void RE_ReadRenderResult(struct Scene *scene, struct Scene *scenode);
  void RE_WriteRenderResult(RenderResult *rr, char *filename, int compress);
index 244efaf8d057f2ace9f89f40c6da94757e576031,75c8d806b9e49a1d9d901d0d3648ec30f0bf8720..9c35451bca0dee3f5ba91186853cf34f4394caff
@@@ -2835,16 -2811,6 +2820,16 @@@ void RE_BlenderFrame(Render *re, Scene 
        RenderGlobal.renderingslot= RenderGlobal.viewslot;
  }
  
-       if(render_initialize_from_scene(re, scene, NULL, 0, 0)) {
 +void RE_RenderFreestyleStrokes(Render *re, Scene *scene)
 +{
 +      re->result_ok= 0;
 +      scene->r.cfra= 1;
++      if(render_initialize_from_scene(re, scene, NULL, scene->lay, 0, 0)) {
 +              do_render_all_options(re);
 +      }
 +      re->result_ok= 1;
 +}
 +
  static int do_write_image_or_movie(Render *re, Scene *scene, bMovieHandle *mh, ReportList *reports)
  {
        char name[FILE_MAX];
Simple merge