diff options
| author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2011-06-11 04:22:10 +0400 |
|---|---|---|
| committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2011-06-11 04:22:10 +0400 |
| commit | 32c7e22d3696e3575f4b7d05c1f7140591e88809 (patch) | |
| tree | 44d501cb62aebd638a7f7b5d0306ecc03e0deb5f /source/blender/makesrna/intern/rna_main.c | |
| parent | dfcd01553536d63dab1037d0ea289b9d9d90c39c (diff) | |
| parent | 6fb82a85c9a48c9fad6cb7b42994a9cd7b2b491a (diff) | |
Merged changes in the trunk up to revision 37388.
Conflicts resolved:
release/scripts/startup/bl_ui/properties_render.py
source/creator/SConscript
source/blender/blenlib/intern/bpath.c
source/blender/editors/space_outliner/outliner.c
Diffstat (limited to 'source/blender/makesrna/intern/rna_main.c')
| -rw-r--r-- | source/blender/makesrna/intern/rna_main.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/source/blender/makesrna/intern/rna_main.c b/source/blender/makesrna/intern/rna_main.c index 7bee58e9e1f..2629d1cefa7 100644 --- a/source/blender/makesrna/intern/rna_main.c +++ b/source/blender/makesrna/intern/rna_main.c @@ -42,7 +42,7 @@ /* all the list begin functions are added manually here, Main is not in SDNA */ -static int rna_Main_is_saved_get(PointerRNA *ptr) +static int rna_Main_is_saved_get(PointerRNA *UNUSED(ptr)) { return G.relbase_valid; } @@ -50,8 +50,9 @@ static int rna_Main_is_saved_get(PointerRNA *ptr) static int rna_Main_is_dirty_get(PointerRNA *ptr) { /* XXX, not totally nice to do it this way, should store in main ? */ + Main *bmain= (Main*)ptr->data; wmWindowManager *wm; - for(wm= G.main->wm.first; wm; wm= wm->id.next) { + for(wm= bmain->wm.first; wm; wm= wm->id.next) { return !wm->file_saved; } |