[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [28861] branches/render25/source/blender: reversion of dupli commits

[Joseph Eagar]

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

Log Message:
-----------
reversion of dupli commits

Modified Paths:
--------------
    branches/render25/source/blender/blenkernel/intern/anim.c
    branches/render25/source/blender/blenloader/intern/readfile.c
    branches/render25/source/blender/gpu/intern/gpu_draw.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 12:23:29 UTC (rev 28860)
+++ branches/render25/source/blender/blenkernel/intern/anim.c	2010-05-19 13:26:21 UTC (rev 28861)
@@ -645,7 +645,7 @@
 				mul_m4_m4m4(mat, go->ob->obmat, ob->obmat);
 			}
 			
-			dob= new_dupli_object(lb, go->ob, mat, go->ob->lay, 0, OB_DUPLIGROUP, animated);
+			dob= new_dupli_object(lb, go->ob, mat, ob->lay, 0, OB_DUPLIGROUP, animated);
 
 			/* check the group instance and object layers match, also that the object visible flags are ok. */
 			if(	(dob->origlay & group->layer)==0 ||
@@ -665,10 +665,6 @@
 			}
 		}
 	}
-
-	for (go=group->gobject.first; go; go=go->next) {
-		go->ob->lay = ob->lay;
-	}
 }
 
 static void frames_duplilist(ListBase *lb, Scene *scene, Object *ob, int level, int animated)
@@ -819,7 +815,7 @@
 			oblay = base->lay;
 		} else {
 			ob_iter= go->ob;
-			oblay = group->layer;
+			oblay = ob_iter->lay;
 		}
 		
 		if (lay & oblay && scene->obedit!=ob_iter) {
@@ -951,7 +947,7 @@
 			oblay = base->lay;
 		} else {
 			ob_iter= go->ob;
-			oblay = group->layer;
+			oblay = ob_iter->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 12:23:29 UTC (rev 28860)
+++ branches/render25/source/blender/blenloader/intern/readfile.c	2010-05-19 13:26:21 UTC (rev 28861)
@@ -2121,7 +2121,6 @@
 	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)

Modified: branches/render25/source/blender/gpu/intern/gpu_draw.c
===================================================================
--- branches/render25/source/blender/gpu/intern/gpu_draw.c	2010-05-19 12:23:29 UTC (rev 28860)
+++ branches/render25/source/blender/gpu/intern/gpu_draw.c	2010-05-19 13:26:21 UTC (rev 28861)
@@ -526,7 +526,7 @@
 	}
 
 	/* scale if not a power of two */
-	if (!mipmap && (!is_pow2_limit(rectw) || !is_pow2_limit(recth))) {
+	if ((!is_pow2_limit(rectw) || !is_pow2_limit(recth))) {
 		rectw= smaller_pow2_limit(rectw);
 		recth= smaller_pow2_limit(recth);
 		

Modified: branches/render25/source/blender/makesdna/DNA_group_types.h
===================================================================
--- branches/render25/source/blender/makesdna/DNA_group_types.h	2010-05-19 12:23:29 UTC (rev 28860)
+++ branches/render25/source/blender/makesdna/DNA_group_types.h	2010-05-19 13:26:21 UTC (rev 28861)
@@ -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 pad1;
+	int pad;
 } GroupObject;
 
 

Modified: branches/render25/source/blender/windowmanager/intern/wm_files.c
===================================================================
--- branches/render25/source/blender/windowmanager/intern/wm_files.c	2010-05-19 12:23:29 UTC (rev 28860)
+++ branches/render25/source/blender/windowmanager/intern/wm_files.c	2010-05-19 13:26:21 UTC (rev 28861)
@@ -504,7 +504,7 @@
 		return -1;
 	}
  
-	/* XX: implement the OnSave event */
+	/* send 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");