diff options
author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2009-01-15 07:22:23 +0300 |
---|---|---|
committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2009-01-15 07:22:23 +0300 |
commit | 2213fa1c528027d363a546fe3a5377f65b5a6d26 (patch) | |
tree | 81109b4a0e1a6d855dec83d1a0baae7b9d60f088 /source/blender/blenloader | |
parent | f08032e8f967e5c5893116fc24c82a18da7bdf79 (diff) |
RNA
* Work around bScreen/Screen DNA name patching, so bScreen does not
require manual callbacks to be written for properties.
* Added SpaceLink and SpaceImage RNA.
* Fix issue initializing ID property arrays with default values.
DNA
* Some DNA changes for space image.
* And a fix for corrupt clone image pointer in reading brushes.
Diffstat (limited to 'source/blender/blenloader')
-rw-r--r-- | source/blender/blenloader/intern/readfile.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c index 10cdb218585..c0d873ed6b0 100644 --- a/source/blender/blenloader/intern/readfile.c +++ b/source/blender/blenloader/intern/readfile.c @@ -1490,6 +1490,8 @@ static void lib_link_brush(FileData *fd, Main *main) if(mtex) mtex->tex= newlibadr_us(fd, brush->id.lib, mtex->tex); } + + brush->clone.image= newlibadr_us(fd, brush->id.lib, brush->clone.image); } } } @@ -5237,6 +5239,7 @@ static void area_add_window_regions(ScrArea *sa, SpaceLink *sl, ListBase *lb) break; } } + /* main region */ ar= MEM_callocN(sizeof(ARegion), "area region from do_versions"); |