Commit: ed52706d352334f15c1183131461a8112427ea22
Author: Jens Verwiebe
Date: Sun Nov 16 17:12:49 2014 +0100
Branches: master
https://developer.blender.org/rBed52706d352334f15c1183131461a8112427ea22
Just 2 comments cleaned
===================================================================
M CMakeLists.txt
M source/blender/editors/space_file/fsmenu.h
===================================================================
diff --git a/CMakeLists.txt b/CMakeLists.txt
index acf1bb4..b9e38c3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2049,7 +2049,7 @@ elseif(APPLE)
link_directories(${LIBDIR}/openmp/lib)
# This is a workaround for our helperbinaries (
datatoc, masgfmt, ... ),
# They are linked also to omp lib, so we need
it in builddir for runtime exexcution, TODO: remove all unneeded dependencies
from these
- execute_process(COMMAND ditto -arch
${CMAKE_OSX_ARCHITECTURES} ${LIBDIR}/openmp/lib/libiomp5.dylib
${CMAKE_BINARY_DIR}/Resources/lib/libiomp5.dylib) # for intermediate binaries,
lib id @loader_path
+ execute_process(COMMAND ditto -arch
${CMAKE_OSX_ARCHITECTURES} ${LIBDIR}/openmp/lib/libiomp5.dylib
${CMAKE_BINARY_DIR}/Resources/lib/libiomp5.dylib) # for intermediate binaries,
in respect to lib ID
endif()
endif()
endif()
diff --git a/source/blender/editors/space_file/fsmenu.h
b/source/blender/editors/space_file/fsmenu.h
index 8c4dd31..831ec13 100644
--- a/source/blender/editors/space_file/fsmenu.h
+++ b/source/blender/editors/space_file/fsmenu.h
@@ -48,7 +48,7 @@ typedef enum FSMenuInsert {
FS_INSERT_SORTED = (1 << 0),
FS_INSERT_SAVE = (1 << 1),
FS_INSERT_FIRST = (1 << 2), /* moves the item to the front of the
list when its not already there */
- FS_APPEND_LAST = (1 << 3) /*just append to preseve delivered order
*/
+ FS_APPEND_LAST = (1 << 3) /* just append to preseve delivered order
*/
} FSMenuInsert;
struct FSMenu;
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
