diff options
| author | Luca Rood <dev@lucarood.com> | 2017-05-04 20:59:27 +0300 |
|---|---|---|
| committer | Luca Rood <dev@lucarood.com> | 2017-05-04 21:05:59 +0300 |
| commit | 3103b819aa530da29e9853cb67e3f0b77d349d4e (patch) | |
| tree | 598272bccd325ad6ec70e5b919c9cd53eee9f5ec /source/blender/blenkernel | |
| parent | b5b9b2d04db4b3cf08d219d00e5f7d1d82725ad1 (diff) | |
Vertex paint with draw manager
Reviewers: fclem
Subscribers: campbellbarton, dfelinto
Differential Revision: https://developer.blender.org/D2658
Diffstat (limited to 'source/blender/blenkernel')
| -rw-r--r-- | source/blender/blenkernel/BKE_mesh.h | 2 | ||||
| -rw-r--r-- | source/blender/blenkernel/intern/deform.c | 2 | ||||
| -rw-r--r-- | source/blender/blenkernel/intern/layer.c | 20 | ||||
| -rw-r--r-- | source/blender/blenkernel/intern/object_deform.c | 2 |
4 files changed, 23 insertions, 3 deletions
diff --git a/source/blender/blenkernel/BKE_mesh.h b/source/blender/blenkernel/BKE_mesh.h index db6f40756a4..e0f62cfd894 100644 --- a/source/blender/blenkernel/BKE_mesh.h +++ b/source/blender/blenkernel/BKE_mesh.h @@ -411,7 +411,7 @@ void BKE_mesh_eval_geometry(struct EvaluationContext *eval_ctx, enum { BKE_MESH_BATCH_DIRTY_ALL = 0, BKE_MESH_BATCH_DIRTY_SELECT, - BKE_MESH_BATCH_DIRTY_WEIGHT, + BKE_MESH_BATCH_DIRTY_PAINT, }; void BKE_mesh_batch_cache_dirty(struct Mesh *me, int mode); void BKE_mesh_batch_cache_free(struct Mesh *me); diff --git a/source/blender/blenkernel/intern/deform.c b/source/blender/blenkernel/intern/deform.c index 22ba050e4fb..3b91534e321 100644 --- a/source/blender/blenkernel/intern/deform.c +++ b/source/blender/blenkernel/intern/deform.c @@ -74,7 +74,7 @@ bDeformGroup *BKE_defgroup_new(Object *ob, const char *name) BLI_addtail(&ob->defbase, defgroup); defgroup_unique_name(defgroup, ob); - BKE_mesh_batch_cache_dirty(ob->data, BKE_MESH_BATCH_DIRTY_WEIGHT); + BKE_mesh_batch_cache_dirty(ob->data, BKE_MESH_BATCH_DIRTY_PAINT); return defgroup; } diff --git a/source/blender/blenkernel/intern/layer.c b/source/blender/blenkernel/intern/layer.c index 8182d7d0706..a136728ecc4 100644 --- a/source/blender/blenkernel/intern/layer.c +++ b/source/blender/blenkernel/intern/layer.c @@ -1105,6 +1105,22 @@ static void layer_collection_create_mode_settings_paint_weight(IDProperty *root, IDP_AddToGroup(root, props); } +static void layer_collection_create_mode_settings_paint_vertex(IDProperty *root, const bool populate) +{ + IDProperty *props; + IDPropertyTemplate val = {0}; + + props = IDP_New(IDP_GROUP, &val, "VertexPaintMode"); + props->subtype = IDP_GROUP_SUB_MODE_PAINT_VERTEX; + + /* properties */ + if (populate) { + PAINT_VERTEX_collection_settings_create(props); + } + + IDP_AddToGroup(root, props); +} + static void collection_create_render_settings(IDProperty *root, const bool populate) { CollectionEngineSettingsCB_Type *ces_type; @@ -1121,6 +1137,7 @@ static void collection_create_mode_settings(IDProperty *root, const bool populat layer_collection_create_mode_settings_object(root, populate); layer_collection_create_mode_settings_edit(root, populate); layer_collection_create_mode_settings_paint_weight(root, populate); + layer_collection_create_mode_settings_paint_vertex(root, populate); } static int idproperty_group_subtype(const int mode_type) @@ -1137,6 +1154,9 @@ static int idproperty_group_subtype(const int mode_type) case COLLECTION_MODE_PAINT_WEIGHT: idgroup_type = IDP_GROUP_SUB_MODE_PAINT_WEIGHT; break; + case COLLECTION_MODE_PAINT_VERTEX: + idgroup_type = IDP_GROUP_SUB_MODE_PAINT_VERTEX; + break; default: case COLLECTION_MODE_NONE: return IDP_GROUP_SUB_ENGINE_RENDER; diff --git a/source/blender/blenkernel/intern/object_deform.c b/source/blender/blenkernel/intern/object_deform.c index 990c96c9576..455c4b6352d 100644 --- a/source/blender/blenkernel/intern/object_deform.c +++ b/source/blender/blenkernel/intern/object_deform.c @@ -407,7 +407,7 @@ void BKE_object_defgroup_remove(Object *ob, bDeformGroup *defgroup) else object_defgroup_remove_object_mode(ob, defgroup); - BKE_mesh_batch_cache_dirty(ob->data, BKE_MESH_BATCH_DIRTY_WEIGHT); + BKE_mesh_batch_cache_dirty(ob->data, BKE_MESH_BATCH_DIRTY_PAINT); } /** |