From f992c92872743cb1ab6ae773eeae19d816a92274 Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Mon, 28 Jan 2019 13:04:20 +0100 Subject: Fix blenderplayer build after OpenMP changes. --- source/creator/CMakeLists.txt | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'source') diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt index d2255bbd894..1ce8a8d1c4c 100644 --- a/source/creator/CMakeLists.txt +++ b/source/creator/CMakeLists.txt @@ -979,14 +979,13 @@ elseif(APPLE) blenderplayer.app/Contents/ ) - if(WITH_OPENMP AND CMAKE_C_COMPILER_ID MATCHES "Clang" AND NOT ${CMAKE_C_COMPILER_VERSION} VERSION_LESS '3.4') + if(WITH_OPENMP AND OPENMP_CUSTOM) install( - FILES ${LIBDIR}/openmp/lib/libiomp5.dylib - DESTINATION blenderplayer.app/Contents/Resources/lib/ + FILES ${LIBDIR}/openmp/lib/libomp.dylib + DESTINATION blenderplayer.app/Contents/Resources/lib ) endif() - # python if(WITH_PYTHON AND NOT WITH_PYTHON_FRAMEWORK) # Copy the python libs into the install directory -- cgit v1.2.3 From e63869ca802a59e80989c255776f86ad8289cf56 Mon Sep 17 00:00:00 2001 From: Bastien Montagne Date: Mon, 28 Jan 2019 22:25:26 +0100 Subject: Fix T60896: Missing update for Auto Texture Space. --- source/blender/makesrna/intern/rna_mesh.c | 1 + 1 file changed, 1 insertion(+) (limited to 'source') diff --git a/source/blender/makesrna/intern/rna_mesh.c b/source/blender/makesrna/intern/rna_mesh.c index c97cf2923f2..ef2ca9a08df 100644 --- a/source/blender/makesrna/intern/rna_mesh.c +++ b/source/blender/makesrna/intern/rna_mesh.c @@ -3519,6 +3519,7 @@ static void rna_def_mesh(BlenderRNA *brna) RNA_def_property_boolean_sdna(prop, NULL, "texflag", ME_AUTOSPACE); RNA_def_property_ui_text(prop, "Auto Texture Space", "Adjust active object's texture space automatically when transforming object"); + RNA_def_property_update(prop, 0, "rna_Mesh_update_data"); #if 0 prop = RNA_def_property(srna, "texspace_location", PROP_FLOAT, PROP_TRANSLATION); -- cgit v1.2.3