Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Mon, 16 Apr 2018 15:23:24 +0000 (17:23 +0200)
committerCampbell Barton <ideasman42@gmail.com>
Mon, 16 Apr 2018 15:24:20 +0000 (17:24 +0200)
25 files changed:
1  2 
source/blender/blenkernel/BKE_paint.h
source/blender/blenkernel/intern/boids.c
source/blender/blenkernel/intern/constraint.c
source/blender/blenkernel/intern/data_transfer.c
source/blender/blenkernel/intern/effect.c
source/blender/blenkernel/intern/particle_system.c
source/blender/blenkernel/intern/pointcache.c
source/blender/blenkernel/intern/smoke.c
source/blender/blenkernel/intern/softbody.c
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/versioning_260.c
source/blender/collada/AnimationImporter.cpp
source/blender/collada/InstanceWriter.cpp
source/blender/collada/MeshImporter.cpp
source/blender/collada/collada_utils.cpp
source/blender/editors/interface/resources.c
source/blender/editors/mesh/editmesh_knife.c
source/blender/editors/physics/particle_edit.c
source/blender/editors/screen/screen_ops.c
source/blender/editors/space_file/space_file.c
source/blender/editors/space_sequencer/sequencer_draw.c
source/blender/editors/transform/transform.c
source/blender/makesrna/intern/rna_material.c
source/blender/makesrna/intern/rna_mesh_utils.h
source/blender/render/intern/source/shadeoutput.c

Simple merge
index 687b225b83824899c5d192e8b6b7f7495cfa302d,33d0b2ae6088f7055724bdf2472c30344a2c43f1..de9469a48cbd1b5c692d6e43c44408468fed69e0
@@@ -2931,37 -2773,13 +2931,39 @@@ void init_userdef_do_versions(void
                U.uiflag |= USER_LOCK_CURSOR_ADJUST;
        }
  
 +      if (!USER_VERSION_ATLEAST(280, 1)) {
 +              /* interface_widgets.c */
 +              struct uiWidgetColors wcol_tab = {
 +                      {255, 255, 255, 255},
 +                      {83, 83, 83, 255},
 +                      {114, 114, 114, 255},
 +                      {90, 90, 90, 255},
 +
 +                      {0, 0, 0, 255},
 +                      {0, 0, 0, 255},
 +
 +                      0,
 +                      0, 0
 +              };
 +
 +              for (bTheme *btheme = U.themes.first; btheme; btheme = btheme->next) {
 +                      btheme->tui.wcol_tab = wcol_tab;
 +              }
 +      }
 +
        /**
         * Include next version bump.
-        *
-        * (keep this block even if it becomes empty).
         */
+       {
+               /* (keep this block even if it becomes empty). */
+       }
 +      if (((bTheme *)U.themes.first)->tui.manipulator_hi[3] == 0) {
 +              for (bTheme *btheme = U.themes.first; btheme; btheme = btheme->next) {
 +                      ui_theme_space_init_manipulator_colors(btheme);
 +              }
 +      }
 +
        if (U.pixelsize == 0.0f)
                U.pixelsize = 1.0f;