archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Separate proportional edit setting between edit and object mode. They are now used and toggled independently.

Browse Source
This commit is contained in:
Martin Poirier
2010-07-31 19:26:21 +00:00
parent a5e4fc782a
commit 327b4d588b
10 changed files with 67 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
source/blender/editors/transform/transform_generics.c
View File

@@ -38,6 +38,7 @@
#include "DNA_armature_types.h"
#include "DNA_lattice_types.h"
#include "DNA_screen_types.h"
#include "DNA_scene_types.h"
#include "DNA_space_types.h"
#include "DNA_view3d_types.h"
@@ -1033,9 +1034,9 @@ int initTransInfo (bContext *C, TransInfo *t, wmOperator *op, wmEvent *event)
{
switch(RNA_enum_get(op->ptr, "proportional"))
{
case 2: /* XXX connected constant */
case PROP_EDIT_CONNECTED:
t->flag |= T_PROP_CONNECTED;
case 1: /* XXX prop on constant */
case PROP_EDIT_ON:
t->flag |= T_PROP_EDIT;
break;
}
@@ -1045,11 +1046,19 @@ int initTransInfo (bContext *C, TransInfo *t, wmOperator *op, wmEvent *event)
/* use settings from scene only if modal */
if (t->flag & T_MODAL)
{
if ((t->options & CTX_NO_PET) == 0 && (ts->proportional != PROP_EDIT_OFF)) {
t->flag |= T_PROP_EDIT;
if ((t->options & CTX_NO_PET) == 0)
{
if (t->obedit && ts->proportional != PROP_EDIT_OFF)
{
t->flag |= T_PROP_EDIT;
if(ts->proportional == PROP_EDIT_CONNECTED)
t->flag |= T_PROP_CONNECTED;
if(ts->proportional == PROP_EDIT_CONNECTED)
t->flag |= T_PROP_CONNECTED;
}
else if (t->obedit == NULL && ts->proportional_objects)
{
t->flag |= T_PROP_EDIT;
}
}
}
}