tmaq
/
tornavis
1
0
Fork 0
Code Issues 2 Pull Requests 29 Packages Projects 24 Releases Wiki Activity

Add back Blend From Shape in mesh edit mode.

This commit is contained in:
Brecht Van Lommel 2009-10-16 10:05:58 +00:00
parent 61a88bb597
commit 59f330cce0
5 changed files with 97 additions and 133 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
release/scripts/ui/space_view3d.py
View File

@ -794,18 +794,18 @@ class VIEW3D_MT_edit_mesh_specials(bpy.types.Menu):
layout.itemO("mesh.subdivide", text="Subdivide")
layout.item_floatO("mesh.subdivide", "smoothness", 1.0, text="Subdivide Smooth")
layout.itemO("mesh.merge", text="Merge...")
layout.itemO("mesh.remove_doubles", text="Remove Doubles")
layout.itemO("mesh.remove_doubles")
layout.itemO("mesh.hide", text="Hide")
layout.itemO("mesh.reveal", text="Reveal")
layout.itemO("mesh.select_inverse", text="Select Inverse")
layout.itemO("mesh.select_inverse")
layout.itemO("mesh.flip_normals")
layout.itemO("mesh.vertices_smooth", text="Smooth")
# layout.itemO("mesh.bevel", text="Bevel")
layout.itemO("mesh.faces_shade_smooth")
layout.itemO("mesh.faces_shade_flat")
# layout.itemO("mesh.blend_from_shape", text="Blend From Shape")
# layout.itemO("mesh.shape_propagate_to_all", text="Propagate to All Shapes")
layout.itemO("mesh.select_vertex_path", text="Select Vertex Path")
layout.itemO("mesh.blend_from_shape")
# layout.itemO("mesh.shape_propagate_to_all")
layout.itemO("mesh.select_vertex_path")
class VIEW3D_MT_edit_mesh_vertices(bpy.types.Menu):
__label__ = "Vertices"
@ -824,9 +824,9 @@ class VIEW3D_MT_edit_mesh_vertices(bpy.types.Menu):
layout.itemO("mesh.vertices_smooth")
layout.itemO("mesh.remove_doubles")
layout.itemO("mesh.select_vertex_path", text="Select Vertex Path")
layout.itemO("mesh.select_vertex_path")
# uiItemO(layout, "Blend From Shape", 0, "mesh.blend_from_shape");
layout.itemO("mesh.blend_from_shape")
# uiItemO(layout, "Propagate to All Shapes", 0, "mesh.shape_propagate_to_all");
class VIEW3D_MT_edit_mesh_edges(bpy.types.Menu):

1
source/blender/blenlib/BLI_arithb.h
View File

@ -457,6 +457,7 @@ void i_window(
#define BLI_CS_CIE 2
#define RAD2DEG(_rad) ((_rad)*(180.0/M_PI))
#define DEG2RAD(_deg) ((_deg)*(M_PI/180.0))
void hsv_to_rgb(float h, float s, float v, float *r, float *g, float *b);
void hex_to_rgb(char *hexcol, float *r, float *g, float *b);

212
source/blender/editors/mesh/editmesh_tools.c
View File

@ -69,6 +69,7 @@ editmesh_tool.c: UI called tools for editmesh, geometry changes here, otherwise
#include "BKE_customdata.h"
#include "BKE_depsgraph.h"
#include "BKE_global.h"
#include "BKE_key.h"
#include "BKE_library.h"
#include "BKE_mesh.h"
#include "BKE_object.h"
@ -5024,6 +5025,7 @@ void MESH_OT_rip(wmOperatorType *ot)
/************************ Shape Operators *************************/
#if 0
void shape_propagate(Scene *scene, Object *obedit, EditMesh *em, wmOperator *op)
{
EditVert *ev = NULL;
@ -5065,152 +5067,110 @@ void shape_propagate(Scene *scene, Object *obedit, EditMesh *em, wmOperator *op)
DAG_id_flush_update(obedit->data, OB_RECALC_DATA);
return;
}
#endif
void shape_copy_from_lerp(EditMesh *em, KeyBlock* thisBlock, KeyBlock* fromBlock)
static int blend_from_shape_exec(bContext *C, wmOperator *op)
{
EditVert *ev = NULL;
short mval[2], curval[2], event = 0, finished = 0, canceled = 0, fullcopy=0 ;
float perc = 0;
char str[64];
float *data, *odata;
Object *obedit= CTX_data_edit_object(C);
Mesh *me= obedit->data;
Key *key= me->key;
EditMesh *em= BKE_mesh_get_editmesh(me);
EditVert *eve;
KeyBlock *kb;
float *data, co[3];
float blend= RNA_float_get(op->ptr, "blend");
int shape= RNA_enum_get(op->ptr, "shape");
int add= RNA_int_get(op->ptr, "add");
int blended= 0;
data = fromBlock->data;
odata = thisBlock->data;
kb= BLI_findlink(&key->block, shape);
// XXX getmouseco_areawin(mval);
curval[0] = mval[0] + 1; curval[1] = mval[1] + 1;
if(kb) {
data= kb->data;
while (finished == 0)
{
// XXX getmouseco_areawin(mval);
if (mval[0] != curval[0] || mval[1] != curval[1])
{
for(eve=em->verts.first; eve; eve=eve->next){
if(eve->f & SELECT) {
if(eve->keyindex >= 0 && eve->keyindex < kb->totelem) {
VECCOPY(co, data + eve->keyindex*3);
if(mval[0] > curval[0])
perc += 0.1;
else if(mval[0] < curval[0])
perc -= 0.1;
if(add) {
VecMulf(co, blend);
VecAddf(eve->co, eve->co, co);
}
else
VecLerpf(eve->co, eve->co, co, blend);
if(perc < 0) perc = 0;
if(perc > 1) perc = 1;
curval[0] = mval[0];
curval[1] = mval[1];
if(fullcopy == 1){
perc = 1;
}
for(ev = em->verts.first; ev ; ev = ev->next){
if(ev->f & SELECT){
VecLerpf(ev->co,odata+(ev->keyindex*3),data+(ev->keyindex*3),perc);
}
}
sprintf(str,"Blending at %d%c MMB to Copy at 100%c",(int)(perc*100),'%','%');
// DAG_id_flush_update(obedit->data, OB_RECALC_DATA);
// headerprint(str);
// force_draw(0);
if(fullcopy == 1){
break;
}
} else {
PIL_sleep_ms(10);
}
while(qtest()) {
short val=0;
event= extern_qread(&val);
if(val){
if(ELEM3(event, PADENTER, LEFTMOUSE, RETKEY)){
finished = 1;
}
else if (event == MIDDLEMOUSE){
fullcopy = 1;
}
else if (ELEM3(event,ESCKEY,RIGHTMOUSE,RIGHTMOUSE)){
canceled = 1;
finished = 1;
blended= 1;
}
}
}
}
if(!canceled);
else
for(ev = em->verts.first; ev ; ev = ev->next){
if(ev->f & SELECT){
VECCOPY(ev->co, odata+(ev->keyindex*3));
}
}
return;
BKE_mesh_end_editmesh(me, em);
if(!blended)
return OPERATOR_CANCELLED;
DAG_id_flush_update(&me->id, OB_RECALC_DATA);
WM_event_add_notifier(C, NC_GEOM|ND_DATA, me);
return OPERATOR_FINISHED;
}
static EnumPropertyItem *shape_itemf(bContext *C, PointerRNA *ptr, int *free)
{
Object *obedit= CTX_data_edit_object(C);
Mesh *me= obedit->data;
Key *key;
KeyBlock *kb, *actkb;
EnumPropertyItem tmp= {0, "", 0, "", ""}, *item= NULL;
int totitem= 0, a;
if(obedit && obedit->type == OB_MESH) {
key= me->key;
actkb= ob_get_keyblock(obedit);
void shape_copy_select_from(Object *obedit, EditMesh *em, wmOperator *op)
if(key && actkb) {
for(kb=key->block.first, a=0; kb; kb=kb->next, a++) {
if(kb != actkb) {
tmp.value= a;
tmp.identifier= kb->name;
tmp.name= kb->name;
RNA_enum_item_add(&item, &totitem, &tmp);
}
}
}
}
RNA_enum_item_end(&item, &totitem);
*free= 1;
return item;
}
void MESH_OT_blend_from_shape(wmOperatorType *ot)
{
Mesh* me = (Mesh*)obedit->data;
EditVert *ev = NULL;
int totverts = 0,curshape = obedit->shapenr;
PropertyRNA *prop;
static EnumPropertyItem shape_items[]= {{0, NULL, 0, NULL, NULL}};
Key* ky = NULL;
KeyBlock *kb = NULL,*thisBlock = NULL;
int maxlen=32, nr=0, a=0;
char *menu;
/* identifiers */
ot->name= "Blend From Shape";
ot->description= "Blend in shape from a shape key.";
ot->idname= "MESH_OT_blend_from_shape";
if(me->key){
ky = me->key;
} else {
BKE_report(op->reports, RPT_ERROR, "Object Has No Key");
return;
}
/* api callbacks */
ot->exec= blend_from_shape_exec;
ot->invoke= WM_operator_props_popup;
ot->poll= ED_operator_editmesh;
if(ky->block.first){
for(kb=ky->block.first;kb;kb = kb->next){
maxlen += 40; // Size of a block name
if(a == curshape-1){
thisBlock = kb;
}
/* flags */
ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
a++;
}
a=0;
menu = MEM_callocN(maxlen, "Copy Shape Menu Text");
strcpy(menu, "Copy Vert Positions from Shape %t|");
for(kb=ky->block.first;kb;kb = kb->next){
if(a != curshape-1){
sprintf(menu,"%s %s %cx%d|",menu,kb->name,'%',a);
}
a++;
}
// XXX nr = pupmenu_col(menu, 20);
MEM_freeN(menu);
} else {
BKE_report(op->reports, RPT_ERROR, "Object Has No Blendshapes");
return;
}
a = 0;
for(kb=ky->block.first;kb;kb = kb->next){
if(a == nr){
for(ev = em->verts.first;ev;ev = ev->next){
totverts++;
}
if(me->totvert != totverts){
BKE_report(op->reports, RPT_ERROR, "Shape Has had Verts Added/Removed, please cycle editmode before copying");
return;
}
shape_copy_from_lerp(em, thisBlock,kb);
return;
}
a++;
}
return;
/* properties */
prop= RNA_def_enum(ot->srna, "shape", shape_items, 0, "Shape", "Shape key to use for blending.");
RNA_def_enum_funcs(prop, shape_itemf);
RNA_def_float(ot->srna, "blend", 1.0f, -FLT_MAX, FLT_MAX, "Blend", "Blending factor.", -2.0f, 2.0f);
RNA_def_boolean(ot->srna, "add", 1, "Add", "Add rather then blend between shapes.");
}
/************************ Merge Operator *************************/

2
source/blender/editors/mesh/mesh_intern.h
View File

@ -227,6 +227,8 @@ void MESH_OT_colors_mirror(struct wmOperatorType *ot);
void MESH_OT_delete(struct wmOperatorType *ot);
void MESH_OT_rip(struct wmOperatorType *ot);
void MESH_OT_blend_from_shape(struct wmOperatorType *ot);
/* ******************* mesh_layers.c */
void MESH_OT_uv_texture_add(struct wmOperatorType *ot);

1
source/blender/editors/mesh/mesh_ops.c
View File

@ -139,6 +139,7 @@ void ED_operatortypes_mesh(void)
WM_operatortype_append(MESH_OT_flip_normals);
WM_operatortype_append(MESH_OT_knife_cut);
WM_operatortype_append(MESH_OT_rip);
WM_operatortype_append(MESH_OT_blend_from_shape);
WM_operatortype_append(MESH_OT_uv_texture_add);
WM_operatortype_append(MESH_OT_uv_texture_remove);