diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2019-04-13 16:20:15 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2019-04-13 16:24:28 +0300 |
| commit | f7e35d61f826c8e3581b34eea36b8fc39c572bee (patch) | |
| tree | 9becbfddc4e0e2df92ec8cd65d3073063b6add47 /source/blender/editors/space_view3d | |
| parent | 70cbd0a6bdb99001c779412771d9b1ae28f32017 (diff) | |
Cleanup: add View3D_Runtime struct
Also remove 'matcap_icon'
Diffstat (limited to 'source/blender/editors/space_view3d')
| -rw-r--r-- | source/blender/editors/space_view3d/space_view3d.c | 8 | ||||
| -rw-r--r-- | source/blender/editors/space_view3d/view3d_buttons.c | 6 |
2 files changed, 7 insertions, 7 deletions
diff --git a/source/blender/editors/space_view3d/space_view3d.c b/source/blender/editors/space_view3d/space_view3d.c index d46c7a292cb..c18a22fa2ef 100644 --- a/source/blender/editors/space_view3d/space_view3d.c +++ b/source/blender/editors/space_view3d/space_view3d.c @@ -415,8 +415,8 @@ static void view3d_free(SpaceLink *sl) MEM_freeN(vd->localvd); } - if (vd->properties_storage) { - MEM_freeN(vd->properties_storage); + if (vd->runtime.properties_storage) { + MEM_freeN(vd->runtime.properties_storage); } if (vd->fx_settings.ssao) { @@ -443,7 +443,7 @@ static SpaceLink *view3d_duplicate(SpaceLink *sl) if (v3dn->localvd) { v3dn->localvd = NULL; - v3dn->properties_storage = NULL; + v3dn->runtime.properties_storage = NULL; } if (v3dn->shading.type == OB_RENDER) { @@ -452,7 +452,7 @@ static SpaceLink *view3d_duplicate(SpaceLink *sl) /* copy or clear inside new stuff */ - v3dn->properties_storage = NULL; + v3dn->runtime.properties_storage = NULL; if (v3dn->fx_settings.dof) { v3dn->fx_settings.dof = MEM_dupallocN(v3do->fx_settings.dof); } diff --git a/source/blender/editors/space_view3d/view3d_buttons.c b/source/blender/editors/space_view3d/view3d_buttons.c index 3baf297e580..ca30e3d3b01 100644 --- a/source/blender/editors/space_view3d/view3d_buttons.c +++ b/source/blender/editors/space_view3d/view3d_buttons.c @@ -196,10 +196,10 @@ static void apply_scale_factor_clamp(float *val, const int tot, const float ve_m static TransformProperties *v3d_transform_props_ensure(View3D *v3d) { - if (v3d->properties_storage == NULL) { - v3d->properties_storage = MEM_callocN(sizeof(TransformProperties), "TransformProperties"); + if (v3d->runtime.properties_storage == NULL) { + v3d->runtime.properties_storage = MEM_callocN(sizeof(TransformProperties), "TransformProperties"); } - return v3d->properties_storage; + return v3d->runtime.properties_storage; } /* is used for both read and write... */ |