forked from bartvdbraak/blender
incorrectly had CMake storing directory names as filepaths
also correct compiler warning for collada and remove print from own last commit.
This commit is contained in:
parent
d86d68d4e6
commit
8f89e7a309
@ -362,7 +362,7 @@ if(UNIX AND NOT APPLE)
|
|||||||
endif()
|
endif()
|
||||||
|
|
||||||
if(WITH_CODEC_FFMPEG)
|
if(WITH_CODEC_FFMPEG)
|
||||||
set(FFMPEG /usr CACHE FILEPATH "FFMPEG Directory")
|
set(FFMPEG /usr CACHE PATH "FFMPEG Directory")
|
||||||
mark_as_advanced(FFMPEG)
|
mark_as_advanced(FFMPEG)
|
||||||
set(FFMPEG_INCLUDE_DIRS ${FFMPEG}/include)
|
set(FFMPEG_INCLUDE_DIRS ${FFMPEG}/include)
|
||||||
set(FFMPEG_LIBRARIES avformat avcodec avutil avdevice swscale CACHE STRING "FFMPEG Libraries")
|
set(FFMPEG_LIBRARIES avformat avcodec avutil avdevice swscale CACHE STRING "FFMPEG Libraries")
|
||||||
@ -406,18 +406,18 @@ if(UNIX AND NOT APPLE)
|
|||||||
endif()
|
endif()
|
||||||
|
|
||||||
if(WITH_OPENCOLLADA)
|
if(WITH_OPENCOLLADA)
|
||||||
set(OPENCOLLADA /usr/local/opencollada CACHE FILEPATH "OpenCollada Directory")
|
set(OPENCOLLADA /usr/local/opencollada CACHE PATH "OpenCollada Directory")
|
||||||
mark_as_advanced(OPENCOLLADA)
|
mark_as_advanced(OPENCOLLADA)
|
||||||
set(OPENCOLLADA_LIBPATH ${OPENCOLLADA}/lib)
|
set(OPENCOLLADA_LIBPATH ${OPENCOLLADA}/lib)
|
||||||
set(OPENCOLLADA_LIBRARIES OpenCOLLADAStreamWriter OpenCOLLADASaxFrameworkLoader OpenCOLLADAFramework OpenCOLLADABaseUtils GeneratedSaxParser UTF MathMLSolver pcre ftoa buffer xml2)
|
set(OPENCOLLADA_LIBRARIES OpenCOLLADAStreamWriter OpenCOLLADASaxFrameworkLoader OpenCOLLADAFramework OpenCOLLADABaseUtils GeneratedSaxParser UTF MathMLSolver pcre ftoa buffer xml2)
|
||||||
set(OPENCOLLADA_INCLUDE_DIR ${OPENCOLLADA})
|
set(OPENCOLLADA_INCLUDE_DIR ${OPENCOLLADA})
|
||||||
|
|
||||||
set(PCRE /usr CACHE FILEPATH "PCRE Directory")
|
set(PCRE /usr CACHE PATH "PCRE Directory")
|
||||||
mark_as_advanced(PCRE)
|
mark_as_advanced(PCRE)
|
||||||
set(PCRE_LIBPATH ${PCRE}/lib)
|
set(PCRE_LIBPATH ${PCRE}/lib)
|
||||||
set(PCRE_LIB pcre)
|
set(PCRE_LIB pcre)
|
||||||
|
|
||||||
set(EXPAT /usr CACHE FILEPATH "Expat Directory")
|
set(EXPAT /usr CACHE PATH "Expat Directory")
|
||||||
mark_as_advanced(EXPAT)
|
mark_as_advanced(EXPAT)
|
||||||
set(EXPAT_LIBPATH ${EXPAT}/lib)
|
set(EXPAT_LIBPATH ${EXPAT}/lib)
|
||||||
set(EXPAT_LIB expat)
|
set(EXPAT_LIB expat)
|
||||||
|
@ -82,7 +82,6 @@ def complete(line, cursor, namespace, private):
|
|||||||
if RE_MODULE.match(line):
|
if RE_MODULE.match(line):
|
||||||
from . import complete_import
|
from . import complete_import
|
||||||
matches = complete_import.complete(line)
|
matches = complete_import.complete(line)
|
||||||
print(private)
|
|
||||||
if not private:
|
if not private:
|
||||||
matches[:] = [m for m in matches if m[:1] != "_"]
|
matches[:] = [m for m in matches if m[:1] != "_"]
|
||||||
matches.sort()
|
matches.sort()
|
||||||
|
@ -273,7 +273,7 @@ void EffectsExporter::operator()(Material *ma, Object *ob)
|
|||||||
std::string uvname = strlen(t->uvname) ? t->uvname : active_uv;
|
std::string uvname = strlen(t->uvname) ? t->uvname : active_uv;
|
||||||
|
|
||||||
// color
|
// color
|
||||||
if (t->mapto & MAP_COL | MAP_COLSPEC) {
|
if (t->mapto & (MAP_COL | MAP_COLSPEC)) {
|
||||||
ep.setDiffuse(createTexture(ima, uvname, sampler));
|
ep.setDiffuse(createTexture(ima, uvname, sampler));
|
||||||
}
|
}
|
||||||
// ambient
|
// ambient
|
||||||
|
Loading…
Reference in New Issue
Block a user