diff options
author | Antonio Vazquez <blendergit@gmail.com> | 2020-02-05 13:25:50 +0300 |
---|---|---|
committer | Antonio Vazquez <blendergit@gmail.com> | 2020-02-05 17:56:50 +0300 |
commit | c35d6b1854474ec02888f8812041651bdeb5145e (patch) | |
tree | f7ce3bb617511b2a84d06e6f2c4b8a9bd3c98368 /source/blender/blenkernel | |
parent | 1bc2a98a9d609e54c928672f148edfba9d5f8c5a (diff) |
Cleanup: Remove unused function: give_node_material()
Diffstat (limited to 'source/blender/blenkernel')
-rw-r--r-- | source/blender/blenkernel/BKE_material.h | 6 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/material.c | 18 |
2 files changed, 8 insertions, 16 deletions
diff --git a/source/blender/blenkernel/BKE_material.h b/source/blender/blenkernel/BKE_material.h index a0a41a048e3..0fd08dc3246 100644 --- a/source/blender/blenkernel/BKE_material.h +++ b/source/blender/blenkernel/BKE_material.h @@ -60,7 +60,6 @@ void BKE_material_copy_data(struct Main *bmain, const int flag); struct Material *BKE_material_copy(struct Main *bmain, const struct Material *ma); struct Material *BKE_material_localize(struct Material *ma); -struct Material *give_node_material(struct Material *ma); /* returns node material or self */ void BKE_material_make_local(struct Main *bmain, struct Material *ma, const bool lib_local); void BKE_gpencil_material_attr_init(struct Material *ma); @@ -87,7 +86,10 @@ struct Material *BKE_object_material_get(struct Object *ob, short act); void BKE_id_material_assign(struct Main *bmain, struct ID *id, struct Material *ma, short act); void BKE_object_material_assign( struct Main *bmain, struct Object *ob, struct Material *ma, short act, int assign_type); -void BKE_object_material_array_assign(struct Main *bmain, struct Object *ob, struct Material ***matar, short totcol); +void BKE_object_material_array_assign(struct Main *bmain, + struct Object *ob, + struct Material ***matar, + short totcol); short BKE_object_material_slot_find_index(struct Object *ob, struct Material *ma); bool BKE_object_material_slot_add(struct Main *bmain, struct Object *ob); diff --git a/source/blender/blenkernel/intern/material.c b/source/blender/blenkernel/intern/material.c index 91fc0519c07..8159cc03414 100644 --- a/source/blender/blenkernel/intern/material.c +++ b/source/blender/blenkernel/intern/material.c @@ -618,19 +618,6 @@ MaterialGPencilStyle *BKE_gpencil_material_settings(Object *ob, short act) } } -Material *give_node_material(Material *ma) -{ - if (ma && ma->use_nodes && ma->nodetree) { - bNode *node = nodeGetActiveID(ma->nodetree, ID_MA); - - if (node) { - return (Material *)node->id; - } - } - - return NULL; -} - void BKE_material_resize_object(Main *bmain, Object *ob, const short totcol, bool do_id_user) { Material **newmatar; @@ -937,7 +924,10 @@ void BKE_material_remap_object_calc(Object *ob_dst, Object *ob_src, short *remap } /* XXX - this calls many more update calls per object then are needed, could be optimized */ -void BKE_object_material_array_assign(Main *bmain, struct Object *ob, struct Material ***matar, short totcol) +void BKE_object_material_array_assign(Main *bmain, + struct Object *ob, + struct Material ***matar, + short totcol) { int actcol_orig = ob->actcol; short i; |