Merged changes in the trunk up to revision 53729.
authorTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Sat, 12 Jan 2013 02:02:53 +0000 (02:02 +0000)
committerTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Sat, 12 Jan 2013 02:02:53 +0000 (02:02 +0000)
Conflicts resolved:
release/datafiles/startup.blend
source/blender/blenloader/intern/readfile.c

31 files changed:
1  2 
SConstruct
build_files/scons/tools/btools.py
intern/cycles/blender/addon/ui.py
release/datafiles/startup.blend
source/blender/blenkernel/BKE_main.h
source/blender/blenkernel/intern/scene.c
source/blender/blenkernel/intern/subsurf_ccg.c
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/writefile.c
source/blender/bmesh/bmesh_class.h
source/blender/editors/include/UI_resources.h
source/blender/editors/interface/resources.c
source/blender/editors/mesh/editmesh_select.c
source/blender/editors/space_view3d/drawobject.c
source/blender/makesdna/DNA_mesh_types.h
source/blender/makesdna/DNA_meshdata_types.h
source/blender/makesdna/DNA_userdef_types.h
source/blender/makesrna/RNA_access.h
source/blender/makesrna/intern/makesrna.c
source/blender/makesrna/intern/rna_ID.c
source/blender/makesrna/intern/rna_color.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/bmesh/bmesh_py_types.c
source/blender/python/intern/bpy.c
source/blender/python/intern/bpy_app.c
source/blender/render/intern/source/pipeline.c
source/blender/render/intern/source/render_result.c
source/blender/windowmanager/intern/wm_files.c
source/creator/creator.c

diff --cc SConstruct
Simple merge
Simple merge
Simple merge
index c66002de8053c536a10d3258fdc4ed952b484106,599bfb50d6eeca22e442b9ff25d88b0451efd633..dc684178f40e144bb7eab6991b6ccbbd696be52b
Binary files differ
Simple merge
index 151a929a445d8f930795c6d065d68035956238dd,44499f1ae778cc3d0d903e1df57422207a12d6fd..df68f71184373ae49180b35a62d3b9132361a84a
@@@ -5137,6 -5124,16 +5137,16 @@@ static void direct_link_scene(FileData 
                
                sce->toolsettings->imapaint.paintcursor = NULL;
                sce->toolsettings->particle.paintcursor = NULL;
 -              }
+               /* in rare cases this is needed, see [#33806] */
+               if (sce->toolsettings->vpaint) {
+                       sce->toolsettings->vpaint->vpaint_prev = NULL;
+                       sce->toolsettings->vpaint->tot = 0;
++      }
+               if (sce->toolsettings->wpaint) {
+                       sce->toolsettings->wpaint->wpaint_prev = NULL;
+                       sce->toolsettings->wpaint->tot = 0;
+               }
        }
  
        if (sce->ed) {
@@@ -8811,48 -8612,50 +8821,91 @@@ static void do_versions(FileData *fd, L
                }
        }
  
+       if (main->versionfile < 265 || (main->versionfile == 265 && main->subversionfile < 7)) {
+               Curve *cu;
+               for (cu = main->curve.first; cu; cu = cu->id.next) {
+                       if (cu->flag & (CU_FRONT | CU_BACK)) {
+                               if ( cu->ext1 != 0.0f || cu->ext2 != 0.0f) {
+                                       Nurb *nu;
+                                       for (nu = cu->nurb.first; nu; nu = nu->next) {
+                                               int a;
+                                               if (nu->bezt) {
+                                                       BezTriple *bezt = nu->bezt;
+                                                       a = nu->pntsu;
+                                                       while (a--) {
+                                                               bezt->radius = 1.0f;
+                                                               bezt++;
+                                                       }
+                                               }
+                                               else if (nu->bp) {
+                                                       BPoint *bp = nu->bp;
+                                                       a = nu->pntsu * nu->pntsv;
+                                                       while (a--) {
+                                                               bp->radius = 1.0f;
+                                                               bp++;
+                                                       }
+                                               }
+                                       }
+                               }
+                       }
+               }
+       }
+       if (!MAIN_VERSION_ATLEAST(main, 265, 8)) {
+               Mesh *me;
+               for (me = main->mesh.first; me; me = me->id.next) {
+                       BKE_mesh_do_versions_cd_flag_init(me);
+               }
+       }
+       // if (main->versionfile < 265 || (main->versionfile == 265 && main->subversionfile < 7)) {
  
 +#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 1
 +                      /* disable the Misc panel for now */
 +                      if (linestyle->panel == LS_PANEL_MISC) {
 +                              linestyle->panel = LS_PANEL_STROKES;
 +                      }
 +#endif
 +                      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
Simple merge
Simple merge
Simple merge