Revision: 37948
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=37948
Author: campbellbarton
Date: 2011-06-29 13:16:11 +0000 (Wed, 29 Jun 2011)
Log Message:
-----------
incorrectly had CMake storing directory names as filepaths
also correct compiler warning for collada and remove print from own last commit.
Modified Paths:
--------------
trunk/blender/CMakeLists.txt
trunk/blender/release/scripts/modules/console/intellisense.py
trunk/blender/source/blender/collada/EffectExporter.cpp
Modified: trunk/blender/CMakeLists.txt
===================================================================
--- trunk/blender/CMakeLists.txt 2011-06-29 13:00:19 UTC (rev 37947)
+++ trunk/blender/CMakeLists.txt 2011-06-29 13:16:11 UTC (rev 37948)
@@ -362,7 +362,7 @@
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 @@
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)
Modified: trunk/blender/release/scripts/modules/console/intellisense.py
===================================================================
--- trunk/blender/release/scripts/modules/console/intellisense.py
2011-06-29 13:00:19 UTC (rev 37947)
+++ trunk/blender/release/scripts/modules/console/intellisense.py
2011-06-29 13:16:11 UTC (rev 37948)
@@ -82,7 +82,6 @@
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()
Modified: trunk/blender/source/blender/collada/EffectExporter.cpp
===================================================================
--- trunk/blender/source/blender/collada/EffectExporter.cpp 2011-06-29
13:00:19 UTC (rev 37947)
+++ trunk/blender/source/blender/collada/EffectExporter.cpp 2011-06-29
13:16:11 UTC (rev 37948)
@@ -273,7 +273,7 @@
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
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
