Merged changes in the trunk up to revision 34459.
authorTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Sat, 22 Jan 2011 23:38:28 +0000 (23:38 +0000)
committerTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Sat, 22 Jan 2011 23:38:28 +0000 (23:38 +0000)
13 files changed:
1  2 
source/blender/blenkernel/intern/object.c
source/blender/blenlib/intern/bpath.c
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/writefile.c
source/blender/editors/space_nla/nla_channels.c
source/blender/editors/space_outliner/outliner.c
source/blender/makesdna/DNA_ID.h
source/blender/makesdna/DNA_action_types.h
source/blender/makesdna/DNA_scene_types.h
source/blender/makesrna/intern/makesrna.c
source/blender/makesrna/intern/rna_internal.h
source/blender/python/intern/bpy.c
source/creator/creator.c

index 92deb6fbebc54607bddaec85dfcf3f7d18678924,b145eabed94c7d4ce9e0d7004271df41e18d6a9f..c930bd903b47ea70902f6aac90c67782bfd38a68
@@@ -140,12 -132,9 +142,14 @@@ void BLI_bpathIterator_init(struct BPat
        bpi->seqdata.seq= 0;
        bpi->seqdata.seqar= NULL;
        bpi->seqdata.scene= NULL;
-       
+       bpi->flag= flag;
 +      /* Freestyle module specific */
 +      bpi->frsmoduledata.scene= NULL;
 +      bpi->frsmoduledata.layer= NULL;
 +      bpi->frsmoduledata.module= NULL;
 +
        bpi->base_path= basedir; /* normally bmain->name */
        bpi->bmain= bmain;
  
Simple merge
Simple merge
Simple merge