Merged changes in the trunk up to revision 40911.
authorTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Mon, 10 Oct 2011 21:15:11 +0000 (21:15 +0000)
committerTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Mon, 10 Oct 2011 21:15:11 +0000 (21:15 +0000)
Conflicts resolved:
source/blender/blenloader/intern/readfile.c

50 files changed:
1  2 
build_files/scons/tools/Blender.py
doc/python_api/sphinx_doc_gen.py
release/scripts/startup/bl_ui/space_view3d.py
source/blender/blenkernel/CMakeLists.txt
source/blender/blenkernel/intern/BME_conversions.c
source/blender/blenkernel/intern/DerivedMesh.c
source/blender/blenkernel/intern/anim_sys.c
source/blender/blenkernel/intern/cdderivedmesh.c
source/blender/blenkernel/intern/idcode.c
source/blender/blenkernel/intern/library.c
source/blender/blenkernel/intern/material.c
source/blender/blenkernel/intern/object.c
source/blender/blenkernel/intern/scene.c
source/blender/blenlib/intern/bpath.c
source/blender/blenloader/intern/readfile.c
source/blender/editors/animation/anim_channels_defines.c
source/blender/editors/animation/anim_channels_edit.c
source/blender/editors/animation/anim_filter.c
source/blender/editors/include/ED_anim_api.h
source/blender/editors/interface/interface_templates.c
source/blender/editors/mesh/editmesh_mods.c
source/blender/editors/mesh/editmesh_tools.c
source/blender/editors/mesh/mesh_intern.h
source/blender/editors/mesh/mesh_ops.c
source/blender/editors/space_file/filelist.c
source/blender/editors/space_view3d/drawobject.c
source/blender/editors/transform/transform.c
source/blender/makesdna/DNA_ID.h
source/blender/makesdna/DNA_scene_types.h
source/blender/makesrna/RNA_access.h
source/blender/makesrna/SConscript
source/blender/makesrna/intern/CMakeLists.txt
source/blender/makesrna/intern/makesrna.c
source/blender/makesrna/intern/rna_ID.c
source/blender/makesrna/intern/rna_action.c
source/blender/makesrna/intern/rna_color.c
source/blender/makesrna/intern/rna_internal.h
source/blender/makesrna/intern/rna_main.c
source/blender/makesrna/intern/rna_main_api.c
source/blender/makesrna/intern/rna_mesh.c
source/blender/makesrna/intern/rna_scene.c
source/blender/makesrna/intern/rna_userdef.c
source/blender/python/SConscript
source/blender/python/intern/CMakeLists.txt
source/blender/render/intern/include/render_types.h
source/blender/render/intern/source/convertblender.c
source/blender/render/intern/source/pipeline.c
source/blenderplayer/bad_level_call_stubs/stubs.c
source/creator/CMakeLists.txt
source/creator/creator.c

Simple merge
Simple merge
index 98d53ca16dbaf11f52651b1b841eb5ccf52e2fc1,485b8137a0269f27179170a1bbbf4eae849fd547..5219b05b65a0e6549a080ec370835d6fa006201b
@@@ -763,12 -700,13 +764,13 @@@ static void bpath_as_report(struct BPat
  }
  
  /* high level function */
- void checkMissingFiles(Main *bmain, ReportList *reports) {
+ void checkMissingFiles(Main *bmain, ReportList *reports)
+ {
        struct BPathIterator *bpi;
 -
 +      
        /* be sure there is low chance of the path being too short */
 -      char filepath_expanded[FILE_MAXDIR*2];
 -
 +      char filepath_expanded[FILE_MAXDIR*2]; 
 +      
        BLI_bpathIterator_init(&bpi, bmain, bmain->name, 0);
        while (!BLI_bpathIterator_isDone(bpi)) {
                BLI_bpathIterator_getPathExpanded(bpi, filepath_expanded);
@@@ -950,11 -889,12 +953,12 @@@ static int findFileRecursive(char *file
  }
  
  /* high level function - call from fileselector */
- void findMissingFiles(Main *bmain, const char *str) {
+ void findMissingFiles(Main *bmain, const char *str)
+ {
        struct BPathIterator *bpi;
 -
 +      
        /* be sure there is low chance of the path being too short */
 -      char filepath_expanded[FILE_MAXDIR*2];
 +      char filepath_expanded[FILE_MAXDIR*2]; 
        char filepath[FILE_MAX];
        const char *libpath;
        int filesize, recur_depth;
index e5f259e9644ac05241e41b11037848ff3c954480,38b4a77365086180885edd2ca49ed8ef8239809a..a7234c107da214176c525d1c6493dd319c31849b
@@@ -12258,65 -12143,10 +12332,32 @@@ static void do_versions(FileData *fd, L
  
        }
  
-       //set defaults for obstacle avoidance, recast data
+       /* put compatibility code here until next subversion bump */
        {
-               Scene *sce;
-               for(sce = main->scene.first; sce; sce = sce->id.next)
-               {
-                       if (sce->gm.levelHeight == 0.f)
-                               sce->gm.levelHeight = 2.f;
-                       if(sce->gm.recastData.cellsize == 0.0f)
-                               sce->gm.recastData.cellsize = 0.3f;
-                       if(sce->gm.recastData.cellheight == 0.0f)
-                               sce->gm.recastData.cellheight = 0.2f;
-                       if(sce->gm.recastData.agentmaxslope == 0.0f)
-                               sce->gm.recastData.agentmaxslope = M_PI/4;
-                       if(sce->gm.recastData.agentmaxclimb == 0.0f)
-                               sce->gm.recastData.agentmaxclimb = 0.9f;
-                       if(sce->gm.recastData.agentheight == 0.0f)
-                               sce->gm.recastData.agentheight = 2.0f;
-                       if(sce->gm.recastData.agentradius == 0.0f)
-                               sce->gm.recastData.agentradius = 0.6f;
-                       if(sce->gm.recastData.edgemaxlen == 0.0f)
-                               sce->gm.recastData.edgemaxlen = 12.0f;
-                       if(sce->gm.recastData.edgemaxerror == 0.0f)
-                               sce->gm.recastData.edgemaxerror = 1.3f;
-                       if(sce->gm.recastData.regionminsize == 0.0f)
-                               sce->gm.recastData.regionminsize = 50.f;
-                       if(sce->gm.recastData.regionmergesize == 0.0f)
-                               sce->gm.recastData.regionmergesize = 20.f;
-                       if(sce->gm.recastData.vertsperpoly<3)
-                               sce->gm.recastData.vertsperpoly = 6;
-                       if(sce->gm.recastData.detailsampledist == 0.0f)
-                               sce->gm.recastData.detailsampledist = 6.0f;
-                       if(sce->gm.recastData.detailsamplemaxerror == 0.0f)
-                               sce->gm.recastData.detailsamplemaxerror = 1.0f;
-               }                       
        }
  
 +      /* default values in Freestyle settings */
 +      {
 +              Scene *sce;
 +              SceneRenderLayer *srl;
 +              FreestyleLineStyle *linestyle;
 +
 +              for(sce = main->scene.first; sce; sce = sce->id.next) {
 +                      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 == 0)
 +                                      srl->freestyleConfig.raycasting_algorithm= FREESTYLE_ALGO_CULLED_ADAPTIVE_CUMULATIVE;
 +                      }
 +              }
 +              for(linestyle = main->linestyle.first; linestyle; linestyle = linestyle->id.next) {
 +                      if (linestyle->chaining == 0)
 +                              linestyle->chaining= LS_CHAINING_PLAIN;
 +                      if (linestyle->rounds == 0)
 +                              linestyle->rounds= 3;
 +              }
 +      }
 +      
        /* 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
Simple merge
Simple merge
index 6e413f262068a8e288fcf26ea9919be8d37cbeda,0eaacc62f33add368071be48d19445b01191e0be..fa2b2eae8db8173c42ef9ab1e155665285ef70c7
@@@ -1275,13 -1233,14 +1280,14 @@@ static void rna_def_tool_settings(Blend
        
        prop= RNA_def_property(srna, "use_snap_project", PROP_BOOLEAN, PROP_NONE);
        RNA_def_property_boolean_sdna(prop, NULL, "snap_flag", SCE_SNAP_PROJECT);
-       RNA_def_property_ui_text(prop, "Project Individual Elements", "Project individual elements on the surface of other objects");
+       RNA_def_property_ui_text(prop, "Project Individual Elements",
+                                "Project individual elements on the surface of other objects");
        RNA_def_property_ui_icon(prop, ICON_RETOPO, 0);
        RNA_def_property_update(prop, NC_SCENE|ND_TOOLSETTINGS, NULL); /* header redraw */
 -
 +      
        prop= RNA_def_property(srna, "use_snap_self", PROP_BOOLEAN, PROP_NONE);
        RNA_def_property_boolean_negative_sdna(prop, NULL, "snap_flag", SCE_SNAP_NO_SELF);
-       RNA_def_property_ui_text(prop, "Project to Self", "Snap onto its self (editmode)");
+       RNA_def_property_ui_text(prop, "Project to Self", "Snap onto itself (editmode)");
        RNA_def_property_ui_icon(prop, ICON_ORTHO, 0);
        RNA_def_property_update(prop, NC_SCENE|ND_TOOLSETTINGS, NULL); /* header redraw */
        
Simple merge
Simple merge
Simple merge