Merge branch 'master' into blender2.8
authorSergey Sharybin <sergey.vfx@gmail.com>
Mon, 28 Aug 2017 09:27:50 +0000 (11:27 +0200)
committerSergey Sharybin <sergey.vfx@gmail.com>
Mon, 28 Aug 2017 09:27:50 +0000 (11:27 +0200)
19 files changed:
1  2 
source/blender/blenkernel/intern/anim_sys.c
source/blender/blenkernel/intern/icons.c
source/blender/blenkernel/intern/material.c
source/blender/blenkernel/intern/object_deform.c
source/blender/blenkernel/intern/sequencer.c
source/blender/blenloader/intern/readfile.c
source/blender/editors/animation/anim_filter.c
source/blender/editors/animation/keyingsets.c
source/blender/editors/object/object_vgroup.c
source/blender/editors/render/render_shading.c
source/blender/editors/space_outliner/outliner_draw.c
source/blender/editors/space_outliner/outliner_tree.c
source/blender/editors/space_time/space_time.c
source/blender/makesdna/DNA_ID.h
source/blender/makesrna/intern/rna_image.c
source/blender/makesrna/intern/rna_key.c
source/blender/makesrna/intern/rna_space.c
source/blender/makesrna/intern/rna_texture.c
source/blender/windowmanager/intern/wm_operators.c

index db50a04348bc96b1cc39d5689828e5ca34b3e36e,a98a1b13402d410795860512df06594c4040b97d..a407fd0bae8c874bf5a3cbe1ba82c25e6dd605dd
@@@ -253,8 -252,9 +253,10 @@@ PreviewImage **BKE_previewimg_id_get_p(
                ID_PRV_CASE(ID_OB, Object);
                ID_PRV_CASE(ID_GR, Group);
                ID_PRV_CASE(ID_SCE, Scene);
 +              ID_PRV_CASE(ID_SCR, bScreen);
  #undef ID_PRV_CASE
+               default:
+                       break;
        }
  
        return NULL;
index 573ecce322484816bc5d7cb64e6591118568922f,ff4c52967f35e3d5acddaaecad6716986bd1c471..857cd9fb4b5a2c3ac29b5ee8a8d30b23bf334e08
@@@ -10123,8 -9912,7 +10123,9 @@@ void BLO_expand_main(void *fdhandle, Ma
                                        case ID_CF:
                                                expand_cachefile(fd, mainvar, (CacheFile *)id);
                                                break;
 +                                      case ID_WS:
 +                                              expand_workspace(fd, mainvar, (WorkSpace *)id);
+                                       default:
                                                break;
                                        }
                                        
index fd73a27c9f6fcf55ab4736eb63e5689af32f34db,0a27fe14de7d9566ad7b27528b478eea3d1145b4..ce1379f760de1442d25fc613d9767de42d4a7d1e
@@@ -1050,9 -1049,11 +1050,11 @@@ int ANIM_apply_keyingset(bContext *C, L
                                Object *ob = (Object *)ksp->id;
                                
                                // XXX: only object transforms?
 -                              DAG_id_tag_update(&ob->id, OB_RECALC_OB | OB_RECALC_DATA | OB_RECALC_TIME);
 +                              DEG_id_tag_update(&ob->id, OB_RECALC_OB | OB_RECALC_DATA | OB_RECALC_TIME);
                                break;
                        }
+                       default:
+                               break;
                }
                
                /* send notifiers for updates (this doesn't require context to work!) */
Simple merge