[Bf-blender-cvs] [44a4b90] master: Fix collada compile after BKE cleanup

Jens Verwiebe noreply at git.blender.org
Sat Mar 28 18:18:10 CET 2015


Commit: 44a4b90b4f303912390f5f846c1882ef37d975d1
Author: Jens Verwiebe
Date:   Sat Mar 28 18:17:54 2015 +0100
Branches: master
https://developer.blender.org/rB44a4b90b4f303912390f5f846c1882ef37d975d1

Fix collada compile after BKE cleanup

===================================================================

M	source/blender/collada/DocumentImporter.cpp

===================================================================

diff --git a/source/blender/collada/DocumentImporter.cpp b/source/blender/collada/DocumentImporter.cpp
index 462b7b6..0aff514 100644
--- a/source/blender/collada/DocumentImporter.cpp
+++ b/source/blender/collada/DocumentImporter.cpp
@@ -771,9 +771,9 @@ MTex *DocumentImporter::create_texture(COLLADAFW::EffectCommon *ef, COLLADAFW::T
 		return NULL;
 	}
 	
-	ma->mtex[i] = add_mtex();
+	ma->mtex[i] = BKE_texture_mtex_add();
 	ma->mtex[i]->texco = TEXCO_UV;
-	ma->mtex[i]->tex = add_texture(G.main, "Texture");
+	ma->mtex[i]->tex = BKE_texture_add(G.main, "Texture");
 	ma->mtex[i]->tex->type = TEX_IMAGE;
 	ma->mtex[i]->tex->ima = uid_image_map[ima_uid];




More information about the Bf-blender-cvs mailing list