Merge branch 'master' into blender2.8
authorBastien Montagne <montagne29@wanadoo.fr>
Wed, 15 Nov 2017 09:46:19 +0000 (10:46 +0100)
committerBastien Montagne <montagne29@wanadoo.fr>
Wed, 15 Nov 2017 09:46:19 +0000 (10:46 +0100)
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

1  2 
source/blender/alembic/intern/abc_mball.h
source/blender/blenkernel/intern/outliner_treehash.c
source/blender/editors/animation/anim_channels_edit.c
source/blender/editors/object/object_ops.c
source/blender/makesrna/intern/rna_cachefile.c
source/blender/makesrna/intern/rna_mask.c
source/blender/makesrna/intern/rna_sculpt_paint.c
source/blender/makesrna/intern/rna_smoke.c

   */
  
  #include <stdlib.h>
 +#include <string.h>
  
- #include "BKE_outliner_treehash.h"
  #include "BLI_utildefines.h"
  #include "BLI_ghash.h"
  #include "BLI_mempool.h"
  #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"
  
@@@ -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);
  
  
  #ifdef RNA_RUNTIME
  
- #include "BKE_cachefile.h"
  #include "BLI_string.h"
  
 -#include "BKE_depsgraph.h"
+ #include "BKE_cachefile.h"
  #include "DEG_depsgraph.h"
  
  #include "WM_api.h"
  
  #ifdef RNA_RUNTIME
  
+ #include "BLI_math.h"
  #include "DNA_movieclip_types.h"
  
 -#include "BKE_depsgraph.h"
  #include "BKE_mask.h"
  
- #include "BLI_math.h"
 +#include "DEG_depsgraph.h"
 +
  #include "RNA_access.h"
  
  #include "WM_api.h"