[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [13545] trunk/blender/source: feature request from peach, remove selected objects from 1 group.
Campbell Barton
ideasman42 at gmail.com
Sun Feb 3 20:03:18 CET 2008
Revision: 13545
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=13545
Author: campbellbarton
Date: 2008-02-03 20:03:18 +0100 (Sun, 03 Feb 2008)
Log Message:
-----------
feature request from peach, remove selected objects from 1 group.
Also made rem_from_group return if it removed the object which save some looping.
Added a node in the blender help message that background mode dosnt load the .B.blend file as a bug was reported recently because of this.
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/BKE_group.h
trunk/blender/source/blender/blenkernel/intern/group.c
trunk/blender/source/blender/src/buttons_object.c
trunk/blender/source/blender/src/editgroup.c
trunk/blender/source/creator/creator.c
Modified: trunk/blender/source/blender/blenkernel/BKE_group.h
===================================================================
--- trunk/blender/source/blender/blenkernel/BKE_group.h 2008-02-03 18:58:46 UTC (rev 13544)
+++ trunk/blender/source/blender/blenkernel/BKE_group.h 2008-02-03 19:03:18 UTC (rev 13545)
@@ -44,7 +44,7 @@
void unlink_group(struct Group *group);
struct Group *add_group(char *name);
void add_to_group(struct Group *group, struct Object *ob);
-void rem_from_group(struct Group *group, struct Object *ob);
+int rem_from_group(struct Group *group, struct Object *ob);
struct Group *find_group(struct Object *ob, struct Group *group);
int object_in_group(struct Object *ob, struct Group *group);
int group_is_animated(struct Object *parent, struct Group *group);
Modified: trunk/blender/source/blender/blenkernel/intern/group.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/group.c 2008-02-03 18:58:46 UTC (rev 13544)
+++ trunk/blender/source/blender/blenkernel/intern/group.c 2008-02-03 19:03:18 UTC (rev 13545)
@@ -134,21 +134,24 @@
}
/* also used for ob==NULL */
-void rem_from_group(Group *group, Object *ob)
+int rem_from_group(Group *group, Object *ob)
{
GroupObject *go, *gon;
+ int removed = 0;
+ if(group==NULL) return 0;
- if(group==NULL) return;
-
go= group->gobject.first;
while(go) {
gon= go->next;
if(go->ob==ob) {
BLI_remlink(&group->gobject, go);
free_group_object(go);
+ removed = 1;
+ /* should break here since an object being in a group twice cant happen? */
}
go= gon;
}
+ return removed;
}
int object_in_group(Object *ob, Group *group)
Modified: trunk/blender/source/blender/src/buttons_object.c
===================================================================
--- trunk/blender/source/blender/src/buttons_object.c 2008-02-03 18:58:46 UTC (rev 13544)
+++ trunk/blender/source/blender/src/buttons_object.c 2008-02-03 19:03:18 UTC (rev 13545)
@@ -2492,8 +2492,7 @@
{
Object *ob= OBACT;
- rem_from_group(gr_v, ob);
- if(find_group(ob, NULL)==NULL) {
+ if(rem_from_group(gr_v, ob) && find_group(ob, NULL)==NULL) {
ob->flag &= ~OB_FROMGROUP;
BASACT->flag &= ~OB_FROMGROUP;
}
Modified: trunk/blender/source/blender/src/editgroup.c
===================================================================
--- trunk/blender/source/blender/src/editgroup.c 2008-02-03 18:58:46 UTC (rev 13544)
+++ trunk/blender/source/blender/src/editgroup.c 2008-02-03 19:03:18 UTC (rev 13545)
@@ -112,7 +112,7 @@
}
-void rem_selected_from_group(void)
+void rem_selected_from_all_groups(void)
{
Base *base;
Group *group;
@@ -134,6 +134,77 @@
BIF_undo_push("Remove from Group");
}
+
+void rem_selected_from_group(void)
+{
+ char menutext[30+(22*22)], *menupt;
+ int i=0;
+ short ret;
+ Group *group= NULL;
+ Object *ob;
+ Base *base;
+ Group *group_array[24] = {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0};
+
+ /* UnSet Tags for Objects and Groups */
+ for(group= G.main->group.first; group; group= group->id.next) {
+ if(group->id.lib==NULL) {
+ group->id.flag &= ~LIB_DOIT;
+ }
+ }
+ for(ob=G.main->object.first; ob; ob= ob->id.next) {
+ ob->id.flag &= ~LIB_DOIT;
+ }
+
+ /* Not tag selected objects */
+ for(base=FIRSTBASE; base; base= base->next) {
+ if TESTBASELIB(base) {
+ base->object->id.flag |= LIB_DOIT;
+ }
+ }
+
+ menupt = menutext;
+ /* Build a list of groups that contain selected objects */
+ for(group= G.main->group.first; group && i<24; group= group->id.next) {
+ if(group->id.lib==NULL) {
+ GroupObject *go;
+ for(go= group->gobject.first; go; go= go->next) {
+ if(go->ob->id.flag & LIB_DOIT) {
+ group_array[i] = group;
+ menupt += sprintf(menupt, "|%s", group->id.name+2);
+ i++;
+ break; /* Only want to know if this group should go in the list*/
+ }
+ }
+ }
+ }
+
+ /* do we have any groups? */
+ if (group_array[0] == NULL) {
+ error("Object selection contains no groups");
+ } else {
+ ret = pupmenu(menutext);
+ if (ret==-1) {
+ return;
+ } else {
+ group = group_array[ret-1];
+ for(base=FIRSTBASE; base; base= base->next) {
+ if TESTBASELIB(base) {
+ /* if we are removed and are not in any group, set our flag */
+ if(rem_from_group(group, base->object) && find_group(base->object, NULL)==NULL) {
+ base->object->flag &= ~OB_FROMGROUP;
+ base->flag &= ~OB_FROMGROUP;
+ }
+ }
+ }
+ }
+ }
+
+ allqueue(REDRAWVIEW3D, 0);
+ allqueue(REDRAWBUTSOBJECT, 0);
+ DAG_scene_sort(G.scene);
+ BIF_undo_push("Remove from Group");
+}
+
void group_operation_with_menu(void)
{
Group *group= NULL;
@@ -145,7 +216,7 @@
break;
if(group)
- mode= pupmenu("Groups %t|Add to Existing Group %x3|Add to Active Objects Groups %x4|Add to New Group %x1|Remove from All Groups %x2");
+ mode= pupmenu("Groups %t|Add to Existing Group %x3|Add to Active Objects Groups %x4|Add to New Group %x1|Remove from Group %x5|Remove from All Groups %x2");
else
mode= pupmenu("Groups %t|Add to New Group %x1|Remove from All Groups %x2");
@@ -181,6 +252,7 @@
if(mode==4) add_selected_to_act_ob_groups();
else if(mode==1 || mode==3) add_selected_to_group(group);
- else if(mode==2) rem_selected_from_group();
+ else if(mode==2) rem_selected_from_all_groups();
+ else if(mode==5) rem_selected_from_group();
}
}
Modified: trunk/blender/source/creator/creator.c
===================================================================
--- trunk/blender/source/creator/creator.c 2008-02-03 18:58:46 UTC (rev 13544)
+++ trunk/blender/source/creator/creator.c 2008-02-03 19:03:18 UTC (rev 13545)
@@ -182,7 +182,7 @@
printf (" ...may not render to /tmp because loading the blend file overwrites the output path that was set\n");
printf (" \"blender -b test.blend -o /tmp -f 1\" works as expected.\n");
printf ("\nRender options:\n");
- printf (" -b <file>\tRender <file> in background\n");
+ printf (" -b <file>\tRender <file> in background (doesn't load the user defaults .B.blend file)\n");
printf (" -a render frames from start to end (inclusive), only works when used after -b\n");
printf (" -S <name>\tSet scene <name>\n");
printf (" -f <frame>\tRender frame <frame> and save it\n");
More information about the Bf-blender-cvs
mailing list