Commit: ca05c3cca988db1e3d55c49978fe5ad856a95c41
Author: Julian Eisel
Date:   Wed Oct 12 22:07:35 2016 +0200
Branches: soc-2016-layer_manager
https://developer.blender.org/rBca05c3cca988db1e3d55c49978fe5ad856a95c41

Merge branch 'master' into soc-2016-layer_manager

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

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



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

diff --cc source/blender/blenkernel/intern/library_query.c
index 7711854,08f9c43..ecfa86d
--- a/source/blender/blenkernel/intern/library_query.c
+++ b/source/blender/blenkernel/intern/library_query.c
@@@ -374,12 -391,14 +391,16 @@@ void BKE_library_foreach_ID_link(ID *id
  
                                CALLBACK_INVOKE(scene->gpd, IDWALK_USER);
  
 -                              for (base = scene->base.first; base; base = 
base->next) {
 +                              BKE_BASES_ITER_START(scene, base)
 +                              {
                                        CALLBACK_INVOKE(base->object, 
IDWALK_USER);
                                }
 +                              BKE_BASES_ITER_END;
  
+                               for (TimeMarker *marker = scene->markers.first; 
marker; marker = marker->next) {
+                                       CALLBACK_INVOKE(marker->camera, 
IDWALK_NOP);
+                               }
+ 
                                if (toolsett) {
                                        
CALLBACK_INVOKE(toolsett->skgen_template, IDWALK_NOP);
  
diff --cc source/blender/blenloader/intern/readfile.c
index b56071f,c1da78d..f84d22a
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@@ -5608,9 -5615,9 +5618,8 @@@ static bool scene_validate_setscene__li
  static void lib_link_scene(FileData *fd, Main *main)
  {
        Scene *sce;
 -      Base *base, *next;
        Sequence *seq;
        SceneRenderLayer *srl;
-       TimeMarker *marker;
        FreestyleModuleConfig *fmc;
        FreestyleLineSet *fls;
  
diff --cc source/blender/blenloader/intern/versioning_270.c
index af56f61,0d4ff00..66c2987
--- a/source/blender/blenloader/intern/versioning_270.c
+++ b/source/blender/blenloader/intern/versioning_270.c
@@@ -1394,22 -1393,36 +1395,54 @@@ 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, "SmokeModifierData", 
"float", "slice_per_voxel")) {
+                       Object *ob;
+                       ModifierData *md;
+ 
+                       for (ob = main->object.first; ob; ob = ob->id.next) {
+                               for (md = ob->modifiers.first; md; md = 
md->next) {
+                                       if (md->type == eModifierType_Smoke) {
+                                               SmokeModifierData *smd = 
(SmokeModifierData *)md;
+                                               if (smd->domain) {
+                                                       
smd->domain->slice_per_voxel = 5.0f;
+                                                       
smd->domain->slice_depth = 0.5f;
+                                                       
smd->domain->display_thickness = 1.0f;
+                                               }
+                                       }
+                               }
+                       }
+               }
+       }
 +
 +      /* Convert to new layer system */
 +      if (!MAIN_VERSION_ATLEAST(main, 277, 4)) {
 +              if (!DNA_struct_elem_find(fd->filesdna, "Scene", "LayerTree", 
"*object_layers")) {
 +                      for (Scene *sce = main->scene.first; sce; sce = 
sce->id.next) {
 +                              sce->object_layers = BKE_objectlayer_tree_new();
 +
 +                              
BKE_objectlayer_base_entries_reserve(sce->object_layers->active_layer, 
BLI_listbase_count(&sce->base));
 +                              /* For now, simply create a new layer and move 
all objects into it */
 +                              for (Base *base = sce->base.first, *base_next; 
base; base = base_next) {
 +                                      base_next = base->next;
 +                                      BKE_objectlayer_base_assign_ex(base, 
sce->object_layers->active_layer, true, false);
 +                                      base->prev = base->next = NULL;
 +                              }
 +                              BLI_listbase_clear(&sce->base);
 +                      }
 +              }
 +      }
  }
diff --cc source/blender/editors/interface/resources.c
index 2bcf49c,79fa7a7..a57083a
--- a/source/blender/editors/interface/resources.c
+++ b/source/blender/editors/interface/resources.c
@@@ -2743,13 -2739,13 +2747,21 @@@ 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, 1)) {
 +              for (bTheme *btheme = U.themes.first; btheme; btheme = 
btheme->next) {
 +                      btheme->tlayers = btheme->tv3d;
 +                      rgba_char_args_set_fl(btheme->tlayers.back,    0.42, 
0.42, 0.42, 1.0);
 +                      rgba_char_args_set(btheme->tlayers.hilite, 255, 140, 
25, 255);  /* selected files */
 +              }
 +      }
 +
        /**
         * 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