[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [12972] trunk/blender/source/blender/src: Bugfix #7854: Adding Meta/Text Object causes Blender to go into EditMode ( setting disabled)
Joshua Leung
aligorith at gmail.com
Sat Dec 22 04:47:19 CET 2007
Revision: 12972
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=12972
Author: aligorith
Date: 2007-12-22 04:47:19 +0100 (Sat, 22 Dec 2007)
Log Message:
-----------
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.
Modified Paths:
--------------
trunk/blender/source/blender/src/editfont.c
trunk/blender/source/blender/src/editmball.c
Modified: trunk/blender/source/blender/src/editfont.c
===================================================================
--- trunk/blender/source/blender/src/editfont.c 2007-12-21 20:54:39 UTC (rev 12971)
+++ trunk/blender/source/blender/src/editfont.c 2007-12-22 03:47:19 UTC (rev 12972)
@@ -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 @@
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);
}
Modified: trunk/blender/source/blender/src/editmball.c
===================================================================
--- trunk/blender/source/blender/src/editmball.c 2007-12-21 20:54:39 UTC (rev 12971)
+++ trunk/blender/source/blender/src/editmball.c 2007-12-22 03:47:19 UTC (rev 12972)
@@ -49,6 +49,7 @@
#include "DNA_object_types.h"
#include "DNA_scene_types.h"
#include "DNA_view3d_types.h"
+#include "DNA_userdef_types.h"
#include "BKE_utildefines.h"
#include "BKE_depsgraph.h"
@@ -132,6 +133,7 @@
{
MetaElem *ml;
float *curs, mat[3][3], cent[3], imat[3][3], cmat[3][3];
+ short newob= 0;
if(G.scene->id.lib) return;
@@ -150,6 +152,7 @@
make_editMball();
setcursor_space(SPACE_VIEW3D, CURSOR_EDIT);
+ newob= 1;
}
/* deselect */
@@ -222,7 +225,15 @@
DAG_object_flush_update(G.scene, G.obedit, OB_RECALC_DATA); // added ball can influence others
- countall();
+ countall();
+
+ /* if a new object was created, it stores it in Mball, for reload original data and undo */
+ if ( !(newob) || (U.flag & USER_ADD_EDITMODE)) {
+ if(newob) load_editMball();
+ } else {
+ exit_editmode(2);
+ }
+
allqueue(REDRAWALL, 0);
BIF_undo_push("Add MetaElem");
}
More information about the Bf-blender-cvs
mailing list