[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [28859] branches/render25/source/blender: yay better less hackish dupli fix
Joseph Eagar
joeedh at gmail.com
Wed May 19 14:06:48 CEST 2010
Revision: 28859
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=28859
Author: joeedh
Date: 2010-05-19 14:06:48 +0200 (Wed, 19 May 2010)
Log Message:
-----------
yay better less hackish dupli fix
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
Modified: branches/render25/source/blender/blenkernel/intern/anim.c
===================================================================
--- branches/render25/source/blender/blenkernel/intern/anim.c 2010-05-19 11:32:58 UTC (rev 28858)
+++ branches/render25/source/blender/blenkernel/intern/anim.c 2010-05-19 12:06:48 UTC (rev 28859)
@@ -645,7 +645,7 @@
mul_m4_m4m4(mat, go->ob->obmat, ob->obmat);
}
- dob= new_dupli_object(lb, go->ob, mat, ob->lay, 0, OB_DUPLIGROUP, animated);
+ dob= new_dupli_object(lb, go->ob, mat, go->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,6 +665,10 @@
}
}
}
+
+ 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)
@@ -815,7 +819,7 @@
oblay = base->lay;
} else {
ob_iter= go->ob;
- oblay = go->lay;
+ oblay = group->layer;
}
if (lay & oblay && scene->obedit!=ob_iter) {
@@ -947,7 +951,7 @@
oblay = base->lay;
} else {
ob_iter= go->ob;
- oblay = go->lay;
+ oblay = group->layer;
}
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:32:58 UTC (rev 28858)
+++ branches/render25/source/blender/blenloader/intern/readfile.c 2010-05-19 12:06:48 UTC (rev 28859)
@@ -5399,7 +5399,6 @@
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:32:58 UTC (rev 28858)
+++ branches/render25/source/blender/makesdna/DNA_group_types.h 2010-05-19 12:06:48 UTC (rev 28859)
@@ -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 lay; /* original scene layer */
+ int pad1;
} GroupObject;
More information about the Bf-blender-cvs
mailing list