Merged changes in the trunk up to revision 53280.
authorTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Sun, 23 Dec 2012 00:23:11 +0000 (00:23 +0000)
committerTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Sun, 23 Dec 2012 00:23:11 +0000 (00:23 +0000)
30 files changed:
1  2 
build_files/scons/tools/btools.py
release/scripts/startup/bl_ui/properties_render.py
source/blender/blenkernel/intern/bpath.c
source/blender/blenkernel/intern/library.c
source/blender/blenkernel/intern/object.c
source/blender/blenkernel/intern/scene.c
source/blender/blenloader/CMakeLists.txt
source/blender/blenloader/intern/readfile.c
source/blender/bmesh/bmesh_class.h
source/blender/bmesh/intern/bmesh_construct.c
source/blender/editors/animation/anim_filter.c
source/blender/editors/include/UI_resources.h
source/blender/editors/interface/resources.c
source/blender/editors/mesh/editmesh_select.c
source/blender/editors/mesh/editmesh_tools.c
source/blender/editors/mesh/mesh_ops.c
source/blender/editors/space_view3d/drawobject.c
source/blender/makesdna/DNA_mesh_types.h
source/blender/makesdna/DNA_scene_types.h
source/blender/makesdna/DNA_userdef_types.h
source/blender/makesrna/intern/makesrna.c
source/blender/makesrna/intern/rna_mesh.c
source/blender/makesrna/intern/rna_scene.c
source/blender/makesrna/intern/rna_space.c
source/blender/makesrna/intern/rna_userdef.c
source/blender/python/SConscript
source/blender/python/intern/bpy.c
source/blender/render/intern/source/convertblender.c
source/blender/render/intern/source/shadeoutput.c
source/blender/windowmanager/WM_types.h

Simple merge
index 453f35d8057a12de95935e51bd681bfbba880b94,38d41dbc96aaaaf594037226600f9be23a1ae22f..a1440386e995eff6c7c964ff4198d54329d77b6e
@@@ -8633,46 -8431,10 +8640,46 @@@ static void do_versions(FileData *fd, L
                Scene *scene;
  
                for (scene = main->scene.first; scene; scene = scene->id.next) {
-                       if (scene->r.bake_rays_number == 0)
-                               scene->r.bake_rays_number = 256;
+                       if (scene->r.bake_samples == 0)
+                               scene->r.bake_samples = 256;
                }
        }
 +
 +#ifdef WITH_FREESTYLE
 +      /* default values in Freestyle settings */
 +      {
 +              Scene *sce;
 +              SceneRenderLayer *srl;
 +              FreestyleLineStyle *linestyle;
 +
 +              for(sce = main->scene.first; sce; sce = sce->id.next) {
 +                      if (sce->r.line_thickness_mode == 0) {
 +                              sce->r.line_thickness_mode = R_LINE_THICKNESS_ABSOLUTE;
 +                              sce->r.unit_line_thickness = 1.0f;
 +                      }
 +                      for(srl = sce->r.layers.first; srl; srl = srl->next) {
 +                              if (srl->freestyleConfig.mode == 0)
 +                                      srl->freestyleConfig.mode = FREESTYLE_CONTROL_EDITOR_MODE;
 +                              if (srl->freestyleConfig.raycasting_algorithm == FREESTYLE_ALGO_CULLED_ADAPTIVE_CUMULATIVE ||
 +                                  srl->freestyleConfig.raycasting_algorithm == FREESTYLE_ALGO_CULLED_ADAPTIVE_TRADITIONAL) {
 +                                      srl->freestyleConfig.raycasting_algorithm = 0; /* deprecated */
 +                                      srl->freestyleConfig.flags |= FREESTYLE_CULLING;
 +                              }
 +                      }
 +              }
 +              for(linestyle = main->linestyle.first; linestyle; linestyle = linestyle->id.next) {
 +                      if (linestyle->thickness_position == 0) {
 +                              linestyle->thickness_position = LS_THICKNESS_CENTER;
 +                              linestyle->thickness_ratio = 0.5f;
 +                      }
 +                      if (linestyle->chaining == 0)
 +                              linestyle->chaining = LS_CHAINING_PLAIN;
 +                      if (linestyle->rounds == 0)
 +                              linestyle->rounds = 3;
 +              }
 +      }
 +#endif
 +
        /* WATCH IT!!!: pointers from libdata have not been converted yet here! */
        /* WATCH IT 2!: Userdef struct init has to be in editors/interface/resources.c! */
  
Simple merge
index 23d35c804099d435ea5fe1093e802f2d87c6ece0,655ab2bfb150a0b247a221eabcbc83ec59888f72..37fd05f75a59ce6f9b1fc0f95f6a4445871bfe12
@@@ -2214,14 -2144,7 +2212,14 @@@ static size_t animdata_filter_dopesheet
                if ((ntree) && !(ads->filterflag & ADS_FILTER_NONTREE)) {
                        tmp_items += animdata_filter_ds_nodetree(ac, &tmp_data, ads, (ID *)sce, ntree, filter_mode);
                }
+               
 +#ifdef WITH_FREESTYLE
 +              /* line styles */
 +              if ((ads->filterflag & ADS_FILTER_NOLINESTYLE) == 0) {
 +                      tmp_items += animdata_filter_ds_linestyle(ac, &tmp_data, ads, sce, filter_mode);
 +              }
 +#endif
 +              
                /* TODO: one day, when sequencer becomes its own datatype, perhaps it should be included here */
        }
        END_ANIMFILTER_SUBCHANNELS;
Simple merge
Simple merge