[Bf-blender-cvs] [f43e8cceb3d] master: Fix early exit check in BKE_appdir_app_template_has_userpref

Campbell Barton noreply at git.blender.org
Mon Jan 4 07:41:53 CET 2021


Commit: f43e8cceb3dfafc03c278be741479ce6825a6a53
Author: Campbell Barton
Date:   Mon Jan 4 16:36:17 2021 +1100
Branches: master
https://developer.blender.org/rBf43e8cceb3dfafc03c278be741479ce6825a6a53

Fix early exit check in BKE_appdir_app_template_has_userpref

Logical error in 84f21c170dda9e503de440c20bc2753002987901
This check was a no-op, replace this with a check for an empty string.

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

M	source/blender/blenkernel/intern/appdir.c

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

diff --git a/source/blender/blenkernel/intern/appdir.c b/source/blender/blenkernel/intern/appdir.c
index 874b24ecfe8..ff799d9a495 100644
--- a/source/blender/blenkernel/intern/appdir.c
+++ b/source/blender/blenkernel/intern/appdir.c
@@ -1014,7 +1014,7 @@ bool BKE_appdir_app_template_has_userpref(const char *app_template)
 {
   /* Test if app template provides a `userpref.blend`.
    * If not, we will share user preferences with the rest of Blender. */
-  if (!app_template && app_template[0]) {
+  if (app_template[0] == '\0') {
     return false;
   }



More information about the Bf-blender-cvs mailing list