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:
authorTon Roosendaal <ton@blender.org>2006-12-05 19:44:57 +0300
committerTon Roosendaal <ton@blender.org>2006-12-05 19:44:57 +0300
commit869eeadeff956f88f48a3b26ea69d0c2938233a3 (patch)
tree00f22b1f756cf45ad6769ce92b34b6fb2d95a1c0 /source/blender/blenkernel/BKE_material.h
parent3177c4f69fcb53c2aad744ee951ea60d98a77c86 (diff)
Damn! Commit for render passes in wrong dir....
Diffstat (limited to 'source/blender/blenkernel/BKE_material.h')
-rw-r--r--source/blender/blenkernel/BKE_material.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/blenkernel/BKE_material.h b/source/blender/blenkernel/BKE_material.h
index a9609f88c98..93260bac73d 100644
--- a/source/blender/blenkernel/BKE_material.h
+++ b/source/blender/blenkernel/BKE_material.h
@@ -53,7 +53,7 @@ void make_local_material(struct Material *ma);
struct Material ***give_matarar(struct Object *ob);
short *give_totcolp(struct Object *ob);
struct Material *give_current_material(struct Object *ob, int act);
-ID *material_from(struct Object *ob, int act);
+struct ID *material_from(struct Object *ob, int act);
void assign_material(struct Object *ob, struct Material *ma, int act);
void new_material_to_objectdata(struct Object *ob);