incorrectly had CMake storing directory names as filepaths
authorCampbell Barton <ideasman42@gmail.com>
Wed, 29 Jun 2011 13:16:11 +0000 (13:16 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Wed, 29 Jun 2011 13:16:11 +0000 (13:16 +0000)
also correct compiler warning for collada and remove print from own last commit.

CMakeLists.txt
release/scripts/modules/console/intellisense.py
source/blender/collada/EffectExporter.cpp

index 8a4fcbafc5bc662edb45de89856666b6a1cf5768..604040d247f78059e87ca64c4ebc29309ad01973 100644 (file)
@@ -362,7 +362,7 @@ if(UNIX AND NOT APPLE)
        endif()
 
        if(WITH_CODEC_FFMPEG)
-               set(FFMPEG /usr CACHE FILEPATH "FFMPEG Directory")
+               set(FFMPEG /usr CACHE PATH "FFMPEG Directory")
                mark_as_advanced(FFMPEG)
                set(FFMPEG_INCLUDE_DIRS ${FFMPEG}/include)
                set(FFMPEG_LIBRARIES avformat avcodec avutil avdevice swscale CACHE STRING "FFMPEG Libraries")
@@ -406,18 +406,18 @@ if(UNIX AND NOT APPLE)
        endif()
 
        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)
                set(OPENCOLLADA_LIBPATH ${OPENCOLLADA}/lib)
                set(OPENCOLLADA_LIBRARIES OpenCOLLADAStreamWriter OpenCOLLADASaxFrameworkLoader OpenCOLLADAFramework OpenCOLLADABaseUtils GeneratedSaxParser UTF MathMLSolver pcre ftoa buffer xml2)
                set(OPENCOLLADA_INCLUDE_DIR ${OPENCOLLADA})
 
-               set(PCRE /usr CACHE FILEPATH "PCRE Directory")
+               set(PCRE /usr CACHE PATH "PCRE Directory")
                mark_as_advanced(PCRE)
                set(PCRE_LIBPATH ${PCRE}/lib)
                set(PCRE_LIB pcre)
 
-               set(EXPAT /usr CACHE FILEPATH "Expat Directory")
+               set(EXPAT /usr CACHE PATH "Expat Directory")
                mark_as_advanced(EXPAT)
                set(EXPAT_LIBPATH ${EXPAT}/lib)
                set(EXPAT_LIB expat)
index a4793e1a9b6231ad7219443e6856651b89881d45..a177b305fdae81fc3ec0931492f9f165d9db4361 100644 (file)
@@ -82,7 +82,6 @@ def complete(line, cursor, namespace, private):
         if RE_MODULE.match(line):
             from . import complete_import
             matches = complete_import.complete(line)
-            print(private)
             if not private:
                 matches[:] = [m for m in matches if m[:1] != "_"]
             matches.sort()
index 0bbf714137e9da64c92b3992b8b6d8f5948c4800..74756859d3b92a58c1247c04aa95f87b36cf1f6b 100644 (file)
@@ -273,7 +273,7 @@ void EffectsExporter::operator()(Material *ma, Object *ob)
                std::string uvname = strlen(t->uvname) ? t->uvname : active_uv;
 
                // color
-               if (t->mapto & MAP_COL | MAP_COLSPEC) {
+               if (t->mapto & (MAP_COL | MAP_COLSPEC)) {
                        ep.setDiffuse(createTexture(ima, uvname, sampler));
                }
                // ambient