diff options
| author | Joshua Leung <aligorith@gmail.com> | 2007-12-22 06:47:19 +0300 |
|---|---|---|
| committer | Joshua Leung <aligorith@gmail.com> | 2007-12-22 06:47:19 +0300 |
| commit | 8eb44b8fcc4f9e48686aa370ab36e05391e4e865 (patch) | |
| tree | ad2ea4b2ba55424146d476fa23b5154999da2786 /source/blender/src/editfont.c | |
| parent | 276e0569129979fc115d8a8de51c2698ea55f2f6 (diff) | |
Bugfix #7854: Adding Meta/Text Object causes Blender to go into EditMode (setting disabled)
This was caused by a few missing checks for this setting in the appropriate places.
Diffstat (limited to 'source/blender/src/editfont.c')
| -rw-r--r-- | source/blender/src/editfont.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/source/blender/src/editfont.c b/source/blender/src/editfont.c index a3de5d03283..70365c9b234 100644 --- a/source/blender/src/editfont.c +++ b/source/blender/src/editfont.c @@ -58,6 +58,7 @@ #include "DNA_scene_types.h" #include "DNA_text_types.h" #include "DNA_view3d_types.h" +#include "DNA_userdef_types.h" #include "BKE_depsgraph.h" #include "BKE_font.h" @@ -1186,7 +1187,8 @@ void add_primitiveFont(int dummy_argument) cu->tb= MEM_callocN(MAXTEXTBOX*sizeof(TextBox), "textbox"); cu->tb[0].w = cu->tb[0].h = 0.0; - enter_editmode(EM_WAITCURSOR); + if (U.flag & USER_ADD_EDITMODE) + enter_editmode(EM_WAITCURSOR); allqueue(REDRAWALL, 0); } |