[Bf-blender-cvs] [31a3b570379] master: Cleanup: Fix typo in user preference code

Dalai Felinto noreply at git.blender.org
Thu Dec 12 14:16:06 CET 2019


Commit: 31a3b570379c073defb4227f7796603be2dc8b51
Author: Dalai Felinto
Date:   Thu Dec 12 12:44:18 2019 +0100
Branches: master
https://developer.blender.org/rB31a3b570379c073defb4227f7796603be2dc8b51

Cleanup: Fix typo in user preference code

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

M	source/blender/editors/space_view3d/view3d_gizmo_tool_generic.c
M	source/blender/makesdna/DNA_userdef_types.h
M	source/blender/makesrna/intern/rna_userdef.c
M	source/blender/windowmanager/intern/wm_event_system.c
M	source/blender/windowmanager/intern/wm_toolsystem.c

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

diff --git a/source/blender/editors/space_view3d/view3d_gizmo_tool_generic.c b/source/blender/editors/space_view3d/view3d_gizmo_tool_generic.c
index 8b1a84fec1b..848accb8534 100644
--- a/source/blender/editors/space_view3d/view3d_gizmo_tool_generic.c
+++ b/source/blender/editors/space_view3d/view3d_gizmo_tool_generic.c
@@ -52,7 +52,7 @@ static const char *handle_free_id;
 
 static bool WIDGETGROUP_tool_generic_poll(const bContext *C, wmGizmoGroupType *gzgt)
 {
-  if (!USER_EXPEREMENTAL_TEST(&U, use_tool_fallback)) {
+  if (!USER_EXPERIMENTAL_TEST(&U, use_tool_fallback)) {
     return false;
   }
 
diff --git a/source/blender/makesdna/DNA_userdef_types.h b/source/blender/makesdna/DNA_userdef_types.h
index fb88f5c9dd4..6710538a5c7 100644
--- a/source/blender/makesdna/DNA_userdef_types.h
+++ b/source/blender/makesdna/DNA_userdef_types.h
@@ -609,7 +609,7 @@ typedef struct UserDef_Experimental {
   char _pad0[3];
 } UserDef_Experimental;
 
-#define USER_EXPEREMENTAL_TEST(userdef, member) \
+#define USER_EXPERIMENTAL_TEST(userdef, member) \
   (((userdef)->flag & USER_DEVELOPER_UI) && \
    (((userdef)->experimental.flag & USER_EXPERIMENTAL_ALL) || ((userdef)->experimental).member))
 
diff --git a/source/blender/makesrna/intern/rna_userdef.c b/source/blender/makesrna/intern/rna_userdef.c
index 52ad217a9e8..46779c9cf71 100644
--- a/source/blender/makesrna/intern/rna_userdef.c
+++ b/source/blender/makesrna/intern/rna_userdef.c
@@ -579,7 +579,7 @@ static void rna_userdef_autosave_update(Main *bmain, Scene *scene, PointerRNA *p
     static bool rna_userdef_experimental_##member##_get(PointerRNA *ptr) \
     { \
       UserDef *userdef = POINTER_OFFSET(ptr->data, -offsetof(UserDef, experimental)); \
-      return USER_EXPEREMENTAL_TEST(userdef, member); \
+      return USER_EXPERIMENTAL_TEST(userdef, member); \
     }
 
 RNA_USERDEF_EXPERIMENTAL_BOOLEAN_GET(use_tool_fallback)
diff --git a/source/blender/windowmanager/intern/wm_event_system.c b/source/blender/windowmanager/intern/wm_event_system.c
index 1f2eb4e28fc..01f80ab9297 100644
--- a/source/blender/windowmanager/intern/wm_event_system.c
+++ b/source/blender/windowmanager/intern/wm_event_system.c
@@ -3731,7 +3731,7 @@ wmKeyMap *WM_event_get_keymap_from_toolsystem(wmWindowManager *wm, wmEventHandle
     const char *keymap_id = tref_rt->keymap;
 
     /* Support for the gizmo owning the tool keymap. */
-    if (USER_EXPEREMENTAL_TEST(&U, use_tool_fallback)) {
+    if (USER_EXPERIMENTAL_TEST(&U, use_tool_fallback)) {
       if (tref_rt->gizmo_group[0] != '\0' && tref_rt->keymap_fallback[0] != '\n') {
         wmGizmoMap *gzmap = NULL;
         wmGizmoGroup *gzgroup = NULL;
diff --git a/source/blender/windowmanager/intern/wm_toolsystem.c b/source/blender/windowmanager/intern/wm_toolsystem.c
index 5878a82d576..c79f75b5b21 100644
--- a/source/blender/windowmanager/intern/wm_toolsystem.c
+++ b/source/blender/windowmanager/intern/wm_toolsystem.c
@@ -355,7 +355,7 @@ void WM_toolsystem_ref_set_from_runtime(struct bContext *C,
    * pass in the argument to begin with. */
   bool use_fallback_keymap = false;
 
-  if (USER_EXPEREMENTAL_TEST(&U, use_tool_fallback)) {
+  if (USER_EXPERIMENTAL_TEST(&U, use_tool_fallback)) {
     if (tref_rt->gizmo_group[0]) {
       wmGizmoGroupType *gzgt = WM_gizmogrouptype_find(tref_rt->gizmo_group, false);
       if (gzgt) {



More information about the Bf-blender-cvs mailing list