[Bf-blender-cvs] [2a7f8d3cb33] blender2.8: Merge branch 'master' into blender2.8

[Bastien Montagne]

Commit: 2a7f8d3cb332055f026cd09933136d6981b585e7
Author: Bastien Montagne
Date:   Wed Nov 15 10:46:19 2017 +0100
Branches: blender2.8
https://developer.blender.org/rB2a7f8d3cb332055f026cd09933136d6981b585e7

Merge branch 'master' into blender2.8

Conflicts:
	source/blender/blenlib/BLI_math_matrix.h
	source/blender/blenlib/intern/math_matrix.c
	source/blender/blenlib/intern/rand.c
	source/blender/editors/animation/anim_channels_edit.c
	source/blender/makesrna/intern/rna_mask.c

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



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

diff --cc source/blender/blenkernel/intern/outliner_treehash.c
index 3e99dbe37ca,4d97121e2a3..d9a602aa41e
--- a/source/blender/blenkernel/intern/outliner_treehash.c
+++ b/source/blender/blenkernel/intern/outliner_treehash.c
@@@ -27,10 -27,7 +27,8 @@@
   */
  
  #include <stdlib.h>
 +#include <string.h>
  
- #include "BKE_outliner_treehash.h"
- 
  #include "BLI_utildefines.h"
  #include "BLI_ghash.h"
  #include "BLI_mempool.h"
diff --cc source/blender/editors/animation/anim_channels_edit.c
index 580cfaa48c7,82f24c91df1..80a388408a5
--- a/source/blender/editors/animation/anim_channels_edit.c
+++ b/source/blender/editors/animation/anim_channels_edit.c
@@@ -54,11 -53,10 +53,12 @@@
  #include "BKE_fcurve.h"
  #include "BKE_gpencil.h"
  #include "BKE_context.h"
++#include "BKE_library.h"
  #include "BKE_mask.h"
  #include "BKE_global.h"
 -#include "BKE_library.h"
 +#include "BKE_scene.h"
 +
 +#include "DEG_depsgraph_build.h"
  
  #include "UI_view2d.h"
  
diff --cc source/blender/editors/object/object_ops.c
index 07922f2d3b2,9b9f77a1dbb..c87df877d5c
--- a/source/blender/editors/object/object_ops.c
+++ b/source/blender/editors/object/object_ops.c
@@@ -378,15 -374,27 +378,8 @@@ void ED_keymap_object(wmKeyConfig *keyc
  	kmi = WM_keymap_add_item(keymap, "OBJECT_OT_scale_clear", SKEY, KM_PRESS, KM_ALT, 0);
  	RNA_boolean_set(kmi->ptr, "clear_delta", false);
  	
- 	kmi = WM_keymap_add_item(keymap, "OBJECT_OT_location_clear", GKEY, KM_PRESS, KM_ALT | KM_SHIFT, 0);
- 	RNA_boolean_set(kmi->ptr, "clear_delta", true);
- 	kmi = WM_keymap_add_item(keymap, "OBJECT_OT_rotation_clear", RKEY, KM_PRESS, KM_ALT | KM_SHIFT, 0);
- 	RNA_boolean_set(kmi->ptr, "clear_delta", true);
- 	kmi = WM_keymap_add_item(keymap, "OBJECT_OT_scale_clear", SKEY, KM_PRESS, KM_ALT | KM_SHIFT, 0);
- 	RNA_boolean_set(kmi->ptr, "clear_delta", true);
- 	
  	WM_keymap_verify_item(keymap, "OBJECT_OT_origin_clear", OKEY, KM_PRESS, KM_ALT, 0);
  	
 -	WM_keymap_add_item(keymap, "OBJECT_OT_hide_view_clear", HKEY, KM_PRESS, KM_ALT, 0);
 -	kmi = WM_keymap_add_item(keymap, "OBJECT_OT_hide_view_set", HKEY, KM_PRESS, 0, 0);
 -	RNA_boolean_set(kmi->ptr, "unselected", false);
 -
 -	kmi = WM_keymap_add_item(keymap, "OBJECT_OT_hide_view_set", HKEY, KM_PRESS, KM_SHIFT, 0);
 -	RNA_boolean_set(kmi->ptr, "unselected", true);
 -
 -	/* same as above but for rendering */
 -	WM_keymap_add_item(keymap, "OBJECT_OT_hide_render_clear", HKEY, KM_PRESS, KM_ALT | KM_CTRL, 0);
 -	WM_keymap_add_item(keymap, "OBJECT_OT_hide_render_set", HKEY, KM_PRESS, KM_CTRL, 0);
 -
 -	/* conflicts, removing */
 -#if 0
 -	kmi = WM_keymap_add_item(keymap, "OBJECT_OT_hide_render_set", HKEY, KM_PRESS, KM_SHIFT | KM_CTRL, 0)
 -	      RNA_boolean_set(kmi->ptr, "unselected", true);
 -#endif
 -
 -	WM_keymap_add_item(keymap, "OBJECT_OT_move_to_layer", MKEY, KM_PRESS, 0, 0);
 -	
  	kmi = WM_keymap_add_item(keymap, "OBJECT_OT_delete", XKEY, KM_PRESS, 0, 0);
  	RNA_boolean_set(kmi->ptr, "use_global", false);
  
diff --cc source/blender/makesrna/intern/rna_cachefile.c
index 0e59c3784bc,73928d377f1..c0aa1f2a9f4
--- a/source/blender/makesrna/intern/rna_cachefile.c
+++ b/source/blender/makesrna/intern/rna_cachefile.c
@@@ -34,10 -34,11 +34,10 @@@
  
  #ifdef RNA_RUNTIME
  
- #include "BKE_cachefile.h"
- 
  #include "BLI_string.h"
  
+ #include "BKE_cachefile.h"
 -#include "BKE_depsgraph.h"
+ 
  #include "DEG_depsgraph.h"
  
  #include "WM_api.h"
diff --cc source/blender/makesrna/intern/rna_mask.c
index 1c7e6fb9587,c266e0e7f31..564232c3dd4
--- a/source/blender/makesrna/intern/rna_mask.c
+++ b/source/blender/makesrna/intern/rna_mask.c
@@@ -52,14 -52,13 +52,14 @@@
  
  #ifdef RNA_RUNTIME
  
+ #include "BLI_math.h"
+ 
  #include "DNA_movieclip_types.h"
  
 -#include "BKE_depsgraph.h"
  #include "BKE_mask.h"
  
 +#include "DEG_depsgraph.h"
 +
- #include "BLI_math.h"
- 
  #include "RNA_access.h"
  
  #include "WM_api.h"