blender
/
blender
134
399
Fork 582
Code Issues 6.3k Pull Requests 752 Projects 19 Wiki Activity

Cleanup: Fix typo in user preference code

This commit is contained in:
Dalai Felinto 2019-12-12 12:44:18 +01:00
parent 77d82ed1fd
commit 31a3b57037
5 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/editors/space_view3d/view3d_gizmo_tool_generic.c
View File

@ -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;
}

2
source/blender/makesdna/DNA_userdef_types.h
View File

@ -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))

2
source/blender/makesrna/intern/rna_userdef.c
View File

@ -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)

2
source/blender/windowmanager/intern/wm_event_system.c
View File

@ -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;

2
source/blender/windowmanager/intern/wm_toolsystem.c
View File

@ -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) {