blender
/
blender
135
403
Fork 585
Code Issues 6.3k Pull Requests 760 Projects 19 Wiki Activity

Merge branch 'blender2.7'

This commit is contained in:
Brecht Van Lommel 2019-01-27 20:17:11 +01:00
parent d97df138d1 d377cd5db1
commit 690478027b
Notes: blender-bot 2023-02-14 05:53:42 +01:00 
Referenced by issue #61344, Normal Map default values are wrong
Referenced by issue #61265, Quick Favorite items not remembered after restarting Blender
Referenced by issue #61267, Crash When Editing Mesh Used For Bone Custom Display
Referenced by issue #61196, clipping border allows selection of clipped vertices when x-ray mode is disabled
Referenced by issue #60965, Texture Painting is slow / lags with large brush size
Referenced by issue #60954, Texture Paint behaving weird on Ctrl + Z sometimes
Referenced by issue #60963, Hair dynamics: hair dynamics not rendered in animation mode when using a force field
Referenced by issue #60953, Normal Map Tangent Space stopped working with Object Texture Coordinate
Referenced by issue #60859, Convert to curve poor result
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
intern/cycles/app/CMakeLists.txt
View File

@ -36,7 +36,7 @@ if(WITH_CYCLES_OSL)
endif()
if(NOT CYCLES_STANDALONE_REPOSITORY)
list(APPEND LIBRARIES bf_intern_glew_mx bf_intern_guardedalloc)
list(APPEND LIBRARIES bf_intern_glew_mx bf_intern_guardedalloc bf_intern_numaapi)
endif()
if(WITH_CYCLES_LOGGING)

3
intern/cycles/util/CMakeLists.txt
View File

@ -33,6 +33,9 @@ if(WITH_CYCLES_STANDALONE)
util_view.cpp
)
endif()
endif()
if(CYCLES_STANDALONE_REPOSITORY)
list(APPEND INC_SYS ../../third_party/numaapi/include)
else()
list(APPEND INC_SYS ../../numaapi/include)