[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [18583] branches/blender2.5/blender/source /blender/editors/object/editgroup.c: 2.5

[Michael Fox]

Revision: 18583
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=18583
Author:   mfoxdogg
Date:     2009-01-20 12:03:53 +0100 (Tue, 20 Jan 2009)

Log Message:
-----------
 2.5
******
small commit, just a few error reports

Modified Paths:
--------------
    branches/blender2.5/blender/source/blender/editors/object/editgroup.c

Modified: branches/blender2.5/blender/source/blender/editors/object/editgroup.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/object/editgroup.c	2009-01-20 10:50:36 UTC (rev 18582)
+++ branches/blender2.5/blender/source/blender/editors/object/editgroup.c	2009-01-20 11:03:53 UTC (rev 18583)
@@ -44,6 +44,7 @@
 #include "BKE_global.h"
 #include "BKE_context.h"
 #include "BKE_main.h"
+#include "BKE_report.h"
 
 #include "ED_view3d.h"
 #include "ED_space_api.h"
@@ -67,6 +68,7 @@
 	Scene *scene= CTX_data_scene(C);
 	Object *ob= OBACT, *obt;
 	Group *group;
+	int ok = 0;
 	
 	if (!ob) return OPERATOR_CANCELLED;
 	
@@ -83,12 +85,15 @@
 				obt->flag |= OB_FROMGROUP;
 				base->flag |= OB_FROMGROUP;
 				base->object->recalc= OB_RECALC_OB;
+				ok = 1;
 			}
 			CTX_DATA_END;
 		}
 		group= group->id.next;
 	}
-
+	
+	if (!ok) BKE_report(op->reports, RPT_ERROR, "Active Object contains no groups");
+	
 	DAG_scene_sort(CTX_data_scene(C));
 	ED_undo_push(C,"Add To Active Group");
 
@@ -115,6 +120,7 @@
 	Scene *scene= CTX_data_scene(C);
 	Object *ob= OBACT, *obt;
 	Group *group;
+	int ok = 0;
 	
 	if (!ob) return OPERATOR_CANCELLED;
 	
@@ -131,12 +137,15 @@
 				obt->flag &= ~OB_FROMGROUP;
 				base->flag &= ~OB_FROMGROUP;
 				base->object->recalc= OB_RECALC_OB;
+				ok = 1;
 			}
 			CTX_DATA_END;
 		}
 		group= group->id.next;
 	}
-
+	
+	if (!ok) BKE_report(op->reports, RPT_ERROR, "Active Object contains no groups");
+	
 	DAG_scene_sort(CTX_data_scene(C));
 	ED_undo_push(C,"Remove From Active Group");