diff options
| author | Nicholas Bishop <nicholasbishop@gmail.com> | 2012-04-13 09:39:27 +0400 |
|---|---|---|
| committer | Nicholas Bishop <nicholasbishop@gmail.com> | 2012-04-13 09:39:27 +0400 |
| commit | 60d3b8f27b31fea67a91184868b20ed95bab458a (patch) | |
| tree | 5089854f068c26ba026e16e07c580ac2d40ee743 /source/blender/makesrna/intern/rna_modifier.c | |
| parent | e9358a38060fefe280018e8ac62e142dabc32a0d (diff) | |
Fix loading external MDisps, BMesh merge bug.
* When converting mfaces to mpolys, load external MDisp data in, add
CustomDataExternal struct to loopdata if needed.
* Fix multires modifier's filepath RNA functions to use ldata rather
than fdata.
Diffstat (limited to 'source/blender/makesrna/intern/rna_modifier.c')
| -rw-r--r-- | source/blender/makesrna/intern/rna_modifier.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/makesrna/intern/rna_modifier.c b/source/blender/makesrna/intern/rna_modifier.c index 11c58139630..42849fbfa16 100644 --- a/source/blender/makesrna/intern/rna_modifier.c +++ b/source/blender/makesrna/intern/rna_modifier.c @@ -490,7 +490,7 @@ static int rna_MultiresModifier_external_get(PointerRNA *ptr) static void rna_MultiresModifier_filepath_get(PointerRNA *ptr, char *value) { Object *ob = (Object*)ptr->id.data; - CustomDataExternal *external = ((Mesh*)ob->data)->fdata.external; + CustomDataExternal *external = ((Mesh*)ob->data)->ldata.external; BLI_strncpy(value, (external)? external->filename: "", sizeof(external->filename)); } @@ -498,7 +498,7 @@ static void rna_MultiresModifier_filepath_get(PointerRNA *ptr, char *value) static void rna_MultiresModifier_filepath_set(PointerRNA *ptr, const char *value) { Object *ob = (Object*)ptr->id.data; - CustomDataExternal *external = ((Mesh*)ob->data)->fdata.external; + CustomDataExternal *external = ((Mesh*)ob->data)->ldata.external; if (external && strcmp(external->filename, value)) { BLI_strncpy(external->filename, value, sizeof(external->filename)); @@ -509,7 +509,7 @@ static void rna_MultiresModifier_filepath_set(PointerRNA *ptr, const char *value static int rna_MultiresModifier_filepath_length(PointerRNA *ptr) { Object *ob = (Object*)ptr->id.data; - CustomDataExternal *external = ((Mesh*)ob->data)->fdata.external; + CustomDataExternal *external = ((Mesh*)ob->data)->ldata.external; return strlen((external)? external->filename: ""); } |