Commit: ed4550bc3af93bdd366c660ec08194a464d48382
Author: Julian Eisel
Date:   Thu Sep 22 01:29:05 2016 +0200
Branches: wiggly-widgets
https://developer.blender.org/rBed4550bc3af93bdd366c660ec08194a464d48382

Merge branch 'master' into wiggly-widgets

Conflicts:
        source/blender/blenloader/intern/versioning_270.c
        source/blender/editors/interface/resources.c

===================================================================



===================================================================

diff --cc source/blender/blenkernel/BKE_blender_version.h
index 5514251,5514251..908e6f2
--- a/source/blender/blenkernel/BKE_blender_version.h
+++ b/source/blender/blenkernel/BKE_blender_version.h
@@@ -28,7 -28,7 +28,7 @@@
   * and keep comment above the defines.
   * Use STRINGIFY() rather than defining with quotes */
  #define BLENDER_VERSION         278
--#define BLENDER_SUBVERSION      1
++#define BLENDER_SUBVERSION      2
  /* Several breakages with 270, e.g. constraint deg vs rad */
  #define BLENDER_MINVERSION      270
  #define BLENDER_MINSUBVERSION   6
diff --cc source/blender/blenloader/intern/versioning_270.c
index 748f62d,aa5ef1c..b4a61a5
--- a/source/blender/blenloader/intern/versioning_270.c
+++ b/source/blender/blenloader/intern/versioning_270.c
@@@ -1392,43 -1392,18 +1392,57 @@@ void blo_do_versions_270(FileData *fd, 
                        }
                }
        }
+       if (!MAIN_VERSION_ATLEAST(main, 279, 0)) {
+               if (!DNA_struct_elem_find(fd->filesdna, "FFMpegCodecData", 
"int", "ffmpeg_preset")) {
+                       for (Scene *scene = main->scene.first; scene; scene = 
scene->id.next) {
+                               /* "medium" is the preset FFmpeg uses when no 
presets are given. */
+                               scene->r.ffcodecdata.ffmpeg_preset = 
FFM_PRESET_MEDIUM;
+                       }
+               }
+               if (!DNA_struct_elem_find(fd->filesdna, "FFMpegCodecData", 
"int", "constant_rate_factor")) {
+                       for (Scene *scene = main->scene.first; scene; scene = 
scene->id.next) {
+                               /* fall back to behaviour from before we 
introduced CRF for old files */
+                               scene->r.ffcodecdata.constant_rate_factor = 
FFM_CRF_NONE;
+                       }
+               }
+       }
 +
 +      {
 +              if (!DNA_struct_elem_find(fd->filesdna, "SpaceNode", "float", 
"backdrop_zoom")) {
 +                      bScreen *sc;
 +                      for (sc = main->screen.first; sc; sc = sc->id.next) {
 +                              ScrArea *sa;
 +                              for (sa = sc->areabase.first; sa; sa = 
sa->next) {
 +                                      SpaceLink *sl;
 +                                      for (sl = sa->spacedata.first; sl; sl = 
sl->next) {
 +                                              if (sl->spacetype == 
SPACE_NODE) {
 +                                                      SpaceNode *snode = 
(SpaceNode *)sl;
 +                                                      snode->backdrop_zoom = 
1.0;
 +                                              }
 +                                              if (sl->spacetype == SPACE_SEQ) 
{
 +                                                      SpaceSeq *sseq = 
(SpaceSeq *)sl;
 +                                                      sseq->overdrop_zoom = 
1.0;
 +                                              }
 +                                      }
 +                              }
 +                      }
 +              }
 +
 +              if (!DNA_struct_elem_find(fd->filesdna, "SpaceIpo", "float", 
"backdrop_zoom")) {
 +                      bScreen *sc;
 +                      for (sc = main->screen.first; sc; sc = sc->id.next) {
 +                              ScrArea *sa;
 +                              for (sa = sc->areabase.first; sa; sa = 
sa->next) {
 +                                      SpaceLink *sl;
 +                                      for (sl = sa->spacedata.first; sl; sl = 
sl->next) {
 +                                              if (sl->spacetype == SPACE_IPO) 
{
 +                                                      SpaceIpo *sipo = 
(SpaceIpo *)sl;
 +                                                      sipo->backdrop_zoom = 
1.0f;
 +                                                      sipo->backdrop_opacity 
= 0.7f;
 +                                              }
 +                                      }
 +                              }
 +                      }
 +              }
 +      }
  }
diff --cc source/blender/editors/interface/resources.c
index d9fb514,6b7867c..b6de653
--- a/source/blender/editors/interface/resources.c
+++ b/source/blender/editors/interface/resources.c
@@@ -2732,12 -2743,11 +2738,20 @@@ void init_userdef_do_versions(void
        if (!USER_VERSION_ATLEAST(278, 1)) {
                bTheme *btheme;
                for (btheme = U.themes.first; btheme; btheme = btheme->next) {
+                       rgba_char_args_set(btheme->tv3d.vertex_bevel, 0, 165, 
255, 255);
+                       rgba_char_args_set(btheme->tv3d.edge_bevel, 0, 165, 
255, 255);
+               }
+       }
+ 
++      if (!USER_VERSION_ATLEAST(278, 2)) {
++              bTheme *btheme;
++              for (btheme = U.themes.first; btheme; btheme = btheme->next) {
 +                      rgba_char_args_set_fl(btheme->tui.xaxis, 1.0f, 0.27f, 
0.27f, 1.0f); /* red */
 +                      rgba_char_args_set_fl(btheme->tui.yaxis, 0.27f, 1.0f, 
0.27f, 1.0f); /* green */
 +                      rgba_char_args_set_fl(btheme->tui.zaxis, 0.27f, 0.27f, 
1.0f, 1.0f); /* blue */
 +              }
 +      }
 +
        /**
         * Include next version bump.
         *

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs

Reply via email to