[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [28858] branches/render25/source/blender: duplis in groups were not working

[Joseph Eagar]

Revision: 28858
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=28858
Author:   joeedh
Date:     2010-05-19 13:32:58 +0200 (Wed, 19 May 2010)

Log Message:
-----------
duplis in groups were not working

Modified Paths:
--------------
    branches/render25/source/blender/blenkernel/intern/anim.c
    branches/render25/source/blender/blenloader/intern/readfile.c
    branches/render25/source/blender/makesdna/DNA_group_types.h
    branches/render25/source/blender/windowmanager/intern/wm_files.c

Modified: branches/render25/source/blender/blenkernel/intern/anim.c
===================================================================
--- branches/render25/source/blender/blenkernel/intern/anim.c	2010-05-19 11:29:36 UTC (rev 28857)
+++ branches/render25/source/blender/blenkernel/intern/anim.c	2010-05-19 11:32:58 UTC (rev 28858)
@@ -815,7 +815,7 @@
 			oblay = base->lay;
 		} else {
 			ob_iter= go->ob;
-			oblay = ob_iter->lay;
+			oblay = go->lay;
 		}
 		
 		if (lay & oblay && scene->obedit!=ob_iter) {
@@ -947,7 +947,7 @@
 			oblay = base->lay;
 		} else {
 			ob_iter= go->ob;
-			oblay = ob_iter->lay;
+			oblay = go->lay;
 		}
 		
 		if (lay & oblay && scene->obedit!=ob_iter) {

Modified: branches/render25/source/blender/blenloader/intern/readfile.c
===================================================================
--- branches/render25/source/blender/blenloader/intern/readfile.c	2010-05-19 11:29:36 UTC (rev 28857)
+++ branches/render25/source/blender/blenloader/intern/readfile.c	2010-05-19 11:32:58 UTC (rev 28858)
@@ -2121,6 +2121,7 @@
 	for(node= ntree->nodes.first; node; node= node->next) {
 		node->preview= newimaadr(fd, node->preview);
 		node->lasty= 0;
+		node->new_node = NULL;
 		for(sock= node->inputs.first; sock; sock= sock->next)
 			sock->link= newdataadr(fd, sock->link);
 		for(sock= node->outputs.first; sock; sock= sock->next)
@@ -5398,6 +5399,7 @@
 					add_us= 1;
 					if(go->ob->id.us==0) 
 						go->ob->id.us= 1;
+					go->lay = go->ob->lay;
 				}
 				go= go->next;
 			}

Modified: branches/render25/source/blender/makesdna/DNA_group_types.h
===================================================================
--- branches/render25/source/blender/makesdna/DNA_group_types.h	2010-05-19 11:29:36 UTC (rev 28857)
+++ branches/render25/source/blender/makesdna/DNA_group_types.h	2010-05-19 11:32:58 UTC (rev 28858)
@@ -41,7 +41,7 @@
 	struct Object *ob;
 	void *lampren;		/* used while render */
 	int recalc;			/* copy of ob->recalc, used to set animated groups OK */
-	int pad;
+	int lay;			/* original scene layer */
 } GroupObject;
 
 

Modified: branches/render25/source/blender/windowmanager/intern/wm_files.c
===================================================================
--- branches/render25/source/blender/windowmanager/intern/wm_files.c	2010-05-19 11:29:36 UTC (rev 28857)
+++ branches/render25/source/blender/windowmanager/intern/wm_files.c	2010-05-19 11:32:58 UTC (rev 28858)
@@ -504,7 +504,7 @@
 		return -1;
 	}
  
-	/* send the OnSave event */
+	/* XX: implement the OnSave event */
 	for (li= G.main->library.first; li; li= li->id.next) {
 		if (BLI_streq(li->name, target)) {
 			BKE_report(reports, RPT_ERROR, "Cannot overwrite used library");