Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicholas Bishop <nicholasbishop@gmail.com>2006-11-06 04:08:26 +0300
committerNicholas Bishop <nicholasbishop@gmail.com>2006-11-06 04:08:26 +0300
commit8e97a2955b2f99ec61189cb972c09676a013a60b (patch)
tree89e67578ceac5a670a309b72295156cbfc7f05c7 /source/blender/src/editview.c
parent6feb2cc4f6d4c2131b959b77a8b87a5d7c9412a4 (diff)
Merged Google Summer of Code sculptmode/multires/retopo tools.
From the tracker: https://projects.blender.org/tracker/index.php?func=detail&aid=5018&group_id=9&atid=127
Diffstat (limited to 'source/blender/src/editview.c')
-rw-r--r--source/blender/src/editview.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/source/blender/src/editview.c b/source/blender/src/editview.c
index 6364831893e..78130f2ea88 100644
--- a/source/blender/src/editview.c
+++ b/source/blender/src/editview.c
@@ -90,6 +90,7 @@
#include "BIF_toolbox.h"
#include "BDR_editobject.h" /* For headerprint */
+#include "BDR_sculptmode.h"
#include "BDR_vpaint.h"
#include "BDR_editface.h"
#include "BDR_drawobject.h"
@@ -1073,6 +1074,10 @@ void set_active_base(Base *base)
DAG_object_flush_update(G.scene, tbase->object, OB_RECALC_DATA);
}
}
+
+ if(base->object->type==OB_MESH && G.f & G_SCULPTMODE) {
+ set_sculpt_object(base->object);
+ }
}
}
@@ -1416,6 +1421,9 @@ void mouse_select(void)
/* selecting a non-mesh, should end a couple of modes... */
if(basact->object->type!=OB_MESH) {
+ if(G.f & G_SCULPTMODE) {
+ set_sculptmode();
+ }
if(G.f & G_WEIGHTPAINT) {
set_wpaint(); /* toggle */
}