Commit: 02f88cfa5e14ecddb36db7c987c105b539cd9065
Author: Julian Eisel
Date: Thu Sep 8 12:45:56 2016 +0200
Branches: soc-2016-layer_manager
https://developer.blender.org/rB02f88cfa5e14ecddb36db7c987c105b539cd9065
Merge branch 'master' into soc-2016-layer_manager
Conflicts:
source/blender/blenkernel/BKE_blender_version.h
===================================================================
===================================================================
diff --cc build_files/cmake/macros.cmake
index e782e15,fabb35c..0404533
--- a/build_files/cmake/macros.cmake
+++ b/build_files/cmake/macros.cmake
@@@ -1576,3 -1578,26 +1580,26 @@@ macro(openmp_delayloa
endif(WITH_OPENMP)
endif(MSVC)
endmacro()
+
+ MACRO(WINDOWS_SIGN_TARGET target)
+ if (WITH_WINDOWS_CODESIGN)
+ if (!SIGNTOOL_EXE)
+ error("Codesigning is enabled, but signtool is not
found")
+ else()
+ if (WINDOWS_CODESIGN_PFX_PASSWORD)
+ set(CODESIGNPASSWORD /p
${WINDOWS_CODESIGN_PFX_PASSWORD})
+ else()
+ if ($ENV{PFXPASSWORD})
+ set(CODESIGNPASSWORD /p
$ENV{PFXPASSWORD})
+ else()
+ message( FATAL_ERROR
"WITH_WINDOWS_CODESIGN is on but WINDOWS_CODESIGN_PFX_PASSWORD not set, and
environment variable PFXPASSWORD not found, unable to sign code.")
+ endif()
+ endif()
+ add_custom_command(TARGET ${target}
+ POST_BUILD
+ COMMAND ${SIGNTOOL_EXE} sign /f
${WINDOWS_CODESIGN_PFX} ${CODESIGNPASSWORD} $<TARGET_FILE:${target}>
+ VERBATIM
+ )
+ endif()
+ endif()
-ENDMACRO()
++ENDMACRO()
diff --cc source/blender/blenkernel/BKE_blender_version.h
index 2247d32,3ae01d8..5514251
--- a/source/blender/blenkernel/BKE_blender_version.h
+++ b/source/blender/blenkernel/BKE_blender_version.h
@@@ -27,8 -27,8 +27,8 @@@
/* these lines are grep'd, watch out for our not-so-awesome regex
* and keep comment above the defines.
* Use STRINGIFY() rather than defining with quotes */
- #define BLENDER_VERSION 277
- #define BLENDER_SUBVERSION 4
+ #define BLENDER_VERSION 278
-#define BLENDER_SUBVERSION 0
++#define BLENDER_SUBVERSION 1
/* Several breakages with 270, e.g. constraint deg vs rad */
#define BLENDER_MINVERSION 270
#define BLENDER_MINSUBVERSION 6
diff --cc source/blender/editors/interface/resources.c
index e87204d,c8ff335..2bcf49c
--- a/source/blender/editors/interface/resources.c
+++ b/source/blender/editors/interface/resources.c
@@@ -2742,14 -2734,6 +2742,14 @@@ void init_userdef_do_versions(void
}
}
- if (!USER_VERSION_ATLEAST(277, 2)) {
++ if (!USER_VERSION_ATLEAST(278, 1)) {
+ for (bTheme *btheme = U.themes.first; btheme; btheme =
btheme->next) {
+ btheme->tlayers = btheme->tv3d;
+ rgba_char_args_set_fl(btheme->tlayers.back, 0.42,
0.42, 0.42, 1.0);
+ rgba_char_args_set(btheme->tlayers.hilite, 255, 140,
25, 255); /* selected files */
+ }
+ }
+
/**
* Include next version bump.
*
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
