Merge branch 'master' into fix/oled_driver_for_splits

2019-05-20 15:47:42 +09:00
parent 4b5a0375d4 3662999df2
commit a90a78c265
57 changed files with 1033 additions and 947 deletions
@@ -258,7 +258,7 @@ bool process_record_quantum(keyrecord_t *record) {
  #ifdef HAPTIC_ENABLE
    process_haptic(keycode, record) &&
  #endif //HAPTIC_ENABLE
-  #if defined(RGB_MATRIX_ENABLE) && defined(RGB_MATRIX_KEYREACTIVE_ENABLED)
+  #if defined(RGB_MATRIX_ENABLE)
    process_rgb_matrix(keycode, record) &&
  #endif
    process_record_kb(keycode, record) &&