diff options
| author | Arystanbek Dyussenov <arystan.d@gmail.com> | 2010-01-30 17:12:51 +0300 |
|---|---|---|
| committer | Arystanbek Dyussenov <arystan.d@gmail.com> | 2010-01-30 17:12:51 +0300 |
| commit | 1f863d0122b37d99a49383e7695d1a0c47a0b114 (patch) | |
| tree | c97feebfa202b4d1cfabedd849d070888fd58af7 /source/blender/collada | |
| parent | 669533437778339e293c8b2bfefa32166a6cc708 (diff) | |
| parent | 7a76bc9a361e6cb45e4292c0ac5c7bb08936b829 (diff) | |
COLLADA branch: merge from trunk -r 25745:26429.
scons+vc build crashes on Blender start when BF_COLLADA is on, don't know why this happens.
Merging from trunk to get working vc project files, then will try to debug and locate the problem.
Diffstat (limited to 'source/blender/collada')
| -rw-r--r-- | source/blender/collada/DocumentImporter.cpp | 2 | ||||
| -rw-r--r-- | source/blender/collada/Makefile | 42 |
2 files changed, 43 insertions, 1 deletions
diff --git a/source/blender/collada/DocumentImporter.cpp b/source/blender/collada/DocumentImporter.cpp index ad8edccbf89..8078ee2e6e0 100644 --- a/source/blender/collada/DocumentImporter.cpp +++ b/source/blender/collada/DocumentImporter.cpp @@ -942,7 +942,7 @@ public: // at this stage we get vertex influence info that should go into me->verts and ob->defbase // there's no info to which object this should be long so we associate it with skin controller data UID - // don't forget to call unique_vertexgroup_name before we copy + // don't forget to call defgroup_unique_name before we copy // controller data uid -> [armature] -> joint data, // [mesh object] diff --git a/source/blender/collada/Makefile b/source/blender/collada/Makefile new file mode 100644 index 00000000000..f2fed004a25 --- /dev/null +++ b/source/blender/collada/Makefile @@ -0,0 +1,42 @@ +# +# $Id$ +# +# ***** BEGIN GPL LICENSE BLOCK ***** +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software Foundation, +# Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# +# The Original Code is Copyright (C) 2008 Blender Foundation. +# All rights reserved. +# +# Contributor(s): none yet. +# +# ***** END GPL LICENSE BLOCK ***** +# +# + +LIBNAME = bf_collada +DIR = $(OCGDIR)/blender/bf_collada + +include nan_compile.mk + +CCFLAGS += $(LEVEL_1_C_WARNINGS) + +CPPFLAGS += -I../makesdna -I../blenlib -I../blenkernel -I../editors/include +CPPFLAGS += -I../windowmanager -I../makesrna +CPPFLAGS += -I$(NAN_GUARDEDALLOC)/include +CPPFLAGS += -I$(BF_OPENCOLLADA)/include/COLLADABaseUtils +CPPFLAGS += -I$(BF_OPENCOLLADA)/include/COLLADAFrameWork +CPPFLAGS += -I$(BF_OPENCOLLADA)/include/COLLADAStreamWriter +CPPFLAGS += -I$(BF_OPENCOLLADA)/include/COLLADASaxFrameworkLoader |