diff options
| author | Shaul Kedem <shaul_kedem@yahoo.com> | 2009-02-15 00:31:34 +0300 |
|---|---|---|
| committer | Shaul Kedem <shaul_kedem@yahoo.com> | 2009-02-15 00:31:34 +0300 |
| commit | a0fada6f184da274ad03c5c999270913f4a6d592 (patch) | |
| tree | d5c3b619b0e9e869881daaeb4018d54edbc27f2b /source/blender/editors/mesh/meshtools.c | |
| parent | aba3c36e33cca600a98588d1a9f559922d1aaaed (diff) | |
added error reporting to edit mesh
Diffstat (limited to 'source/blender/editors/mesh/meshtools.c')
| -rw-r--r-- | source/blender/editors/mesh/meshtools.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/source/blender/editors/mesh/meshtools.c b/source/blender/editors/mesh/meshtools.c index aef22bb7e83..22857b0718b 100644 --- a/source/blender/editors/mesh/meshtools.c +++ b/source/blender/editors/mesh/meshtools.c @@ -47,6 +47,7 @@ #include "DNA_space_types.h" #include "DNA_view3d_types.h" #include "DNA_world_types.h" +#include "DNA_windowmanager_types.h" #include "BLI_arithb.h" #include "BLI_blenlib.h" @@ -67,6 +68,7 @@ #include "BKE_material.h" #include "BKE_object.h" #include "BKE_utildefines.h" +#include "BKE_report.h" #include "RE_pipeline.h" #include "RE_shader_ext.h" @@ -103,7 +105,7 @@ static int pupmenu() {return 0;} /* join selected meshes into the active mesh, context sensitive return 0 if no join is made (error) and 1 of the join is done */ -int join_mesh(Scene *scene, View3D *v3d) +int join_mesh(Scene *scene, View3D *v3d, wmOperator *op) { Base *base, *nextb; Object *ob; @@ -154,11 +156,11 @@ int join_mesh(Scene *scene, View3D *v3d) } if(haskey) { - error("Can't join meshes with vertex keys"); + BKE_report(op->reports, RPT_ERROR, "Can't join meshes with vertex keys"); return 0; } if(hasmulti) { - error("Can't join meshes with Multires"); + BKE_report(op->reports, RPT_ERROR, "Can't join meshes with Multires"); return 0; } /* that way the active object is always selected */ |