From ab0bc65c24bdf68c356adb2566f3669153c931ea Mon Sep 17 00:00:00 2001 From: Bastien Montagne Date: Thu, 7 Mar 2019 11:13:40 +0100 Subject: Refactor CDData masks, to have one mask per mesh elem type. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit We already have different storages for cddata of verts, edges etc., 'simply' do the same for the mask flags we use all around Blender code to request some data, or limit some operation to some layers, etc. Reason we need this is that some cddata types (like Normals) are actually shared between verts/polys/loops, and we don’t want to generate clnors everytime we request vnors! As a side note, this also does final fix to T59338, which was the trigger for this patch (need to request computed loop normals for another mesh than evaluated one). Reviewers: brecht, campbellbarton, sergey Differential Revision: https://developer.blender.org/D4407 --- source/blender/makesdna/DNA_scene_types.h | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'source/blender/makesdna/DNA_scene_types.h') diff --git a/source/blender/makesdna/DNA_scene_types.h b/source/blender/makesdna/DNA_scene_types.h index 5e1f4304389..2607ca5f333 100644 --- a/source/blender/makesdna/DNA_scene_types.h +++ b/source/blender/makesdna/DNA_scene_types.h @@ -34,6 +34,7 @@ extern "C" { #endif #include "DNA_color_types.h" /* color management */ +#include "DNA_customdata_types.h" /* Scene's runtime cddata masks. */ #include "DNA_vec_types.h" #include "DNA_listBase.h" #include "DNA_ID.h" @@ -50,6 +51,7 @@ struct Brush; struct Collection; struct ColorSpace; struct CurveMapping; +struct CustomData_MeshMasks; struct Editing; struct Image; struct MovieClip; @@ -1752,10 +1754,9 @@ typedef struct Scene { void *_pad8; /* XXX. runtime flag for drawing, actually belongs in the window, * only used by BKE_object_handle_update() */ - uint64_t customdata_mask; + struct CustomData_MeshMasks customdata_mask; /* XXX. same as above but for temp operator use (gl renders) */ - uint64_t customdata_mask_modal; - + struct CustomData_MeshMasks customdata_mask_modal; /* Color Management */ ColorManagedViewSettings view_settings; -- cgit v1.2.3