[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [18598] branches/blender2.5/blender/source /blender/editors: 2.5
Michael Fox
mfoxdogg at gmail.com
Wed Jan 21 03:24:20 CET 2009
Revision: 18598
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=18598
Author: mfoxdogg
Date: 2009-01-21 03:24:12 +0100 (Wed, 21 Jan 2009)
Log Message:
-----------
2.5
*******
just a small commit, addeed a few more error, warning reports
Modified Paths:
--------------
branches/blender2.5/blender/source/blender/editors/object/object_edit.c
branches/blender2.5/blender/source/blender/editors/space_view3d/view3d_edit.c
Modified: branches/blender2.5/blender/source/blender/editors/object/object_edit.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/object/object_edit.c 2009-01-20 21:55:48 UTC (rev 18597)
+++ branches/blender2.5/blender/source/blender/editors/object/object_edit.c 2009-01-21 02:24:12 UTC (rev 18598)
@@ -100,6 +100,7 @@
#include "BKE_object.h"
#include "BKE_particle.h"
#include "BKE_property.h"
+#include "BKE_report.h"
#include "BKE_sca.h"
#include "BKE_scene.h"
#include "BKE_softbody.h"
@@ -1109,8 +1110,10 @@
/* note, poll should check for editable scene */
static int object_clear_track_exec(bContext *C, wmOperator *op)
{
- if(CTX_data_edit_object(C)) return OPERATOR_CANCELLED;
-
+ if(CTX_data_edit_object(C)) {
+ BKE_report(op->reports, RPT_ERROR, "Operation cannot be performed in EditMode");
+ return OPERATOR_CANCELLED;
+ }
CTX_DATA_BEGIN(C, Object*, ob, selected_editable_objects) {
ob->track= NULL;
ob->recalc |= OB_RECALC;
@@ -1216,7 +1219,10 @@
ob= OBACT;
- if(ob==0) return OPERATOR_CANCELLED;
+ if(ob==0){
+ BKE_report(op->reports, RPT_ERROR, "No Active Object");
+ return OPERATOR_CANCELLED;
+ }
if(nr==1) {
// XXX old animation system
@@ -2485,9 +2491,14 @@
int tot_change=0, tot_lib_error=0, tot_multiuser_arm_error=0;
MVert *mvert;
- if(scene->id.lib || v3d==NULL) return OPERATOR_CANCELLED;
- if (obedit && centermode > 0) return OPERATOR_CANCELLED;
-
+ if(scene->id.lib || v3d==NULL){
+ BKE_report(op->reports, RPT_ERROR, "Operation cannot be performed on Lib data");
+ return OPERATOR_CANCELLED;
+ }
+ if (obedit && centermode > 0) {
+ BKE_report(op->reports, RPT_ERROR, "Operation cannot be performed in EditMode");
+ return OPERATOR_CANCELLED;
+ }
cent[0]= cent[1]= cent[2]= 0.0;
if(obedit) {
@@ -2768,23 +2779,19 @@
}
CTX_DATA_END;
-if (tot_change) {
- ED_anim_dag_flush_update(C);
- allqueue(REDRAWVIEW3D, 0);
- ED_undo_push(C,"Do Center");
- }
+ if (tot_change) {
+ ED_anim_dag_flush_update(C);
+ allqueue(REDRAWVIEW3D, 0);
+ ED_undo_push(C,"Do Center");
+ }
/* Warn if any errors occured */
if (tot_lib_error+tot_multiuser_arm_error) {
- char err[512];
- sprintf(err, "Warning %i Object(s) Not Centered, %i Changed:", tot_lib_error+tot_multiuser_arm_error, tot_change);
-
+ BKE_reportf(op->reports, RPT_WARNING, "%i Object(s) Not Centered, %i Changed:",tot_lib_error+tot_multiuser_arm_error, tot_change);
if (tot_lib_error)
- sprintf(err+strlen(err), "|%i linked library objects", tot_lib_error);
+ BKE_reportf(op->reports, RPT_WARNING, "|%i linked library objects",tot_lib_error);
if (tot_multiuser_arm_error)
- sprintf(err+strlen(err), "|%i multiuser armature object(s)", tot_multiuser_arm_error);
-
- error(err);
+ BKE_reportf(op->reports, RPT_WARNING, "|%i multiuser armature object(s)",tot_multiuser_arm_error);
}
return OPERATOR_FINISHED;
Modified: branches/blender2.5/blender/source/blender/editors/space_view3d/view3d_edit.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/space_view3d/view3d_edit.c 2009-01-20 21:55:48 UTC (rev 18597)
+++ branches/blender2.5/blender/source/blender/editors/space_view3d/view3d_edit.c 2009-01-21 02:24:12 UTC (rev 18598)
@@ -54,6 +54,7 @@
#include "BKE_depsgraph.h"
#include "BKE_object.h"
#include "BKE_global.h"
+#include "BKE_report.h"
#include "BKE_scene.h"
#include "BKE_screen.h"
#include "BKE_utildefines.h"
@@ -1185,9 +1186,10 @@
double p_corner[3];
/* no depths to use, we cant do anything! */
- if (depth_close==MAXFLOAT)
+ if (depth_close==MAXFLOAT){
+ BKE_report(op->reports, RPT_ERROR, "Depth Too Large");
return OPERATOR_CANCELLED;
-
+ }
/* convert border to 3d coordinates */
if (( !gluUnProject(cent[0], cent[1], depth_close, mats.modelview, mats.projection, (GLint *)mats.viewport, &p[0], &p[1], &p[2])) ||
( !gluUnProject((double)rect.xmin, (double)rect.ymin, depth_close, mats.modelview, mats.projection, (GLint *)mats.viewport, &p_corner[0], &p_corner[1], &p_corner[2])))
More information about the Bf-blender-cvs
mailing list