diff options
| author | Dalai Felinto <dfelinto@gmail.com> | 2018-12-07 15:41:57 +0300 |
|---|---|---|
| committer | Dalai Felinto <dfelinto@gmail.com> | 2018-12-07 15:44:19 +0300 |
| commit | cc61b21dff5e58031a165faf9f7c26a9e6032316 (patch) | |
| tree | c33f604f876695e90abb36effc084ea93fb53e2d /source/blender/makesdna/DNA_scene_types.h | |
| parent | ad47b0236e32dc9a583a0d7209d8030bbb7c358e (diff) | |
Partial fix to T58917 - No valid cage
The fix itself simply is to store the cage object as a pointer instead
of a string/name.
That said baking with or without cage is yielding very different results
than in 2.7.
Diffstat (limited to 'source/blender/makesdna/DNA_scene_types.h')
| -rw-r--r-- | source/blender/makesdna/DNA_scene_types.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/makesdna/DNA_scene_types.h b/source/blender/makesdna/DNA_scene_types.h index c34bf32d0cb..b191c4c5a7c 100644 --- a/source/blender/makesdna/DNA_scene_types.h +++ b/source/blender/makesdna/DNA_scene_types.h @@ -521,7 +521,7 @@ typedef struct BakeData { char save_mode; char pad[3]; - char cage[64]; /* MAX_NAME */ + struct Object *cage_object; } BakeData; /* BakeData.normal_swizzle (char) */ @@ -1585,6 +1585,7 @@ typedef struct Scene { /* Physics simulation settings */ struct PhysicsSettings physics_settings; + void *pad8; uint64_t customdata_mask; /* XXX. runtime flag for drawing, actually belongs in the window, only used by BKE_object_handle_update() */ uint64_t customdata_mask_modal; /* XXX. same as above but for temp operator use (gl renders) */ |