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:
authorJiri Hnidek <jiri.hnidek@tul.cz>2005-04-11 23:31:05 +0400
committerJiri Hnidek <jiri.hnidek@tul.cz>2005-04-11 23:31:05 +0400
commit78939c0cc06a67dbf2853ed7d030b9829b812e3f (patch)
tree4a1050d0c6f172bed54dea52d9faf91f2542e24c /source/blender/src/editmball.c
parent52b7b978e319d7cef224601b57350cc63a99faaa (diff)
- It is possible to scale radius of MetaElem again.
- It is possible to change dx, dy and dz params in 3Dview with manipulators or with some shortcuts (S-X, S-Y, S-Z). - User can scale stiffness when green circle is selected. - MetaElem is selected with RMB click at green or red circle, then user can grab or rotate with MetaElem as usual. - Screenshot: http://e-learning.vslib.cz/~hnidek/pics/scale_stiffness.jpg - Captured video: http://e-learning.vslib.cz/~hnidek/captured-videos/scale_stiffness.avi
Diffstat (limited to 'source/blender/src/editmball.c')
-rw-r--r--source/blender/src/editmball.c19
1 files changed, 12 insertions, 7 deletions
diff --git a/source/blender/src/editmball.c b/source/blender/src/editmball.c
index 39b4fd4b99b..598125db08f 100644
--- a/source/blender/src/editmball.c
+++ b/source/blender/src/editmball.c
@@ -177,9 +177,8 @@ void add_primitiveMball(int dummy_argument)
ml->quat[2]= 0.0;
ml->quat[3]= 0.0;
ml->rad= 2.0;
- ml->lay= 1;
ml->s= 2.0;
- ml->flag= SELECT;
+ ml->flag= SELECT | MB_SCALE_RAD;
switch(dummy_argument) {
case 1:
@@ -258,13 +257,19 @@ void mouse_mball()
if(hits>0) {
ml= startelem;
while(ml) {
- /* if(base->lay & G.vd->lay) { */
- for(a=0; a<hits; a++) {
- /* index converted for gl stuff */
- if(ml->selcol==buffer[ 4 * a + 3 ]) act= ml;
+ for(a=0; a<hits; a++) {
+ /* index converted for gl stuff */
+ if(ml->selcol1==buffer[ 4 * a + 3 ]){
+ ml->flag |= MB_SCALE_RAD;
+ act= ml;
}
- /* } */
+ if(ml->selcol2==buffer[ 4 * a + 3 ]){
+ ml->flag &= ~MB_SCALE_RAD;
+ act= ml;
+ }
+
+ }
if(act) break;