Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAntonio Vazquez <blendergit@gmail.com>2020-02-05 13:25:50 +0300
committerAntonio Vazquez <blendergit@gmail.com>2020-02-05 17:56:50 +0300
commitc35d6b1854474ec02888f8812041651bdeb5145e (patch)
treef7ce3bb617511b2a84d06e6f2c4b8a9bd3c98368 /source/blender/blenkernel/intern/material.c
parent1bc2a98a9d609e54c928672f148edfba9d5f8c5a (diff)
Cleanup: Remove unused function: give_node_material()
Diffstat (limited to 'source/blender/blenkernel/intern/material.c')
-rw-r--r--source/blender/blenkernel/intern/material.c18
1 files changed, 4 insertions, 14 deletions
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;