[Bf-blender-cvs] [607b8ae] multi_previews_id: Merge branch 'master' into multi_previews_id

[Bastien Montagne]

Commit: 607b8aee086625f8f45ca4f47939c27f8b81000e
Author: Bastien Montagne
Date:   Tue Nov 1 14:50:41 2016 +0100
Branches: multi_previews_id
https://developer.blender.org/rB607b8aee086625f8f45ca4f47939c27f8b81000e

Merge branch 'master' into multi_previews_id

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



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

diff --cc source/blender/editors/interface/interface_templates.c
index 3077464,bdad667..e7ec323
--- a/source/blender/editors/interface/interface_templates.c
+++ b/source/blender/editors/interface/interface_templates.c
@@@ -3908,9 -3910,10 +3910,10 @@@ void uiTemplateCacheFile(uiLayout *layo
  	uiItemR(row, &fileptr, "frame", 0, "Frame", ICON_NONE);
  
  	row = uiLayoutRow(layout, false);
 -	uiItemL(row, IFACE_("Manual Transform:"), ICON_NONE);
 +	uiItemL(row, IFACE_("Manual Transform:"), ICON_NONE, 0);
  
  	row = uiLayoutRow(layout, false);
+ 	uiLayoutSetEnabled(row, (sbuts->mainb == BCONTEXT_CONSTRAINT));
  	uiItemR(row, &fileptr, "scale", 0, "Scale", ICON_NONE);
  
  	/* TODO: unused for now, so no need to expose. */
diff --cc source/blender/makesdna/DNA_ID.h
index 9f7b420,feeb2d5..944fa2e
--- a/source/blender/makesdna/DNA_ID.h
+++ b/source/blender/makesdna/DNA_ID.h
@@@ -189,11 -191,8 +196,10 @@@ typedef struct PreviewImage 
  	struct GPUTexture *gputexture[2];
  	int icon_id;  /* Used by previews outside of ID context. */
  
 +	/* Number of frames stored in each rect (0 means 'old format', rect is only w * h integers). */
 +	unsigned short num_frames;
 +
- 	char pad;
- 	char use_deferred;  /* for now a mere bool, if we add more deferred loading methods we can switch to bitflag. */
+ 	short tag;  /* Runtime data. */
 -	char pad[2];
  } PreviewImage;
  
  #define PRV_DEFERRED_DATA(prv) \