Skip to content
Permalink
Browse files

Merge remote-tracking branch 'blender278b/master' into port_blender_278

Conflicts:
	release/datafiles/blender_icons.svg
	release/datafiles/blender_icons16/icon16_collapsemenu.dat
	release/datafiles/blender_icons16/icon16_tria_down_bar.dat
	release/datafiles/blender_icons16/icon16_tria_left_bar.dat
	release/datafiles/blender_icons16/icon16_tria_right_bar.dat
	release/datafiles/blender_icons16/icon16_tria_up_bar.dat
	release/datafiles/blender_icons32/icon32_collapsemenu.dat
	release/datafiles/blender_icons32/icon32_tria_down_bar.dat
	release/datafiles/blender_icons32/icon32_tria_left_bar.dat
	release/datafiles/blender_icons32/icon32_tria_right_bar.dat
	release/datafiles/blender_icons32/icon32_tria_up_bar.dat
	release/datafiles/locale
	release/scripts/addons
	release/scripts/addons_contrib
	release/scripts/startup/bl_ui/space_info.py
	release/scripts/startup/bl_ui/space_outliner.py
	release/text/readme.html
	source/blender/blenloader/intern/writefile.c
	source/blender/editors/interface/interface_layout.c
	source/blender/windowmanager/intern/wm_operators.c
  • Loading branch information...
ReinerBforartists committed Feb 9, 2017
2 parents 55f8841 + b16fd22 commit b9ec5aff7d7060e45fd10f5912bd5bb266729d22
Showing with 5,692 additions and 3,722 deletions.
  1. +1 −1 CMakeLists.txt
  2. +2 −2 build_files/build_environment/install_deps.sh
  3. +0 −2 build_files/buildbot/slave_compile.py
  4. +1 −1 build_files/cmake/Modules/GTestTesting.cmake
  5. +0 −7 build_files/cmake/macros.cmake
  6. +14 −4 build_files/cmake/platform/platform_win32_msvc.cmake
  7. +4 −7 doc/python_api/sphinx_doc_gen.py
  8. +2 −2 doc/python_api/sphinx_doc_update.py
  9. +3 −1 extern/gflags/README.blender
  10. +2 −2 extern/gflags/src/gflags.cc
  11. +1 −1 intern/CMakeLists.txt
  12. +0 −2 intern/cycles/CMakeLists.txt
  13. +15 −1 intern/cycles/blender/addon/__init__.py
  14. +1 −1 intern/cycles/blender/addon/engine.py
  15. +20 −0 intern/cycles/blender/addon/properties.py
  16. +21 −6 intern/cycles/blender/addon/ui.py
  17. +7 −0 intern/cycles/blender/blender_mesh.cpp
  18. +3 −0 intern/cycles/blender/blender_session.cpp
  19. +6 −3 intern/cycles/blender/blender_shader.cpp
  20. +10 −0 intern/cycles/blender/blender_sync.cpp
  21. +17 −0 intern/cycles/bvh/bvh.cpp
  22. +4 −0 intern/cycles/bvh/bvh.h
  23. +235 −64 intern/cycles/bvh/bvh_build.cpp
  24. +2 −0 intern/cycles/bvh/bvh_build.h
  25. +13 −0 intern/cycles/bvh/bvh_node.cpp
  26. +6 −1 intern/cycles/bvh/bvh_node.h
  27. +27 −2 intern/cycles/bvh/bvh_params.h
  28. +1 −1 intern/cycles/device/device_cuda.cpp
  29. +2 −0 intern/cycles/kernel/CMakeLists.txt
  30. +22 −2 intern/cycles/kernel/bvh/bvh.h
  31. +1 −1 intern/cycles/kernel/bvh/bvh_subsurface.h
  32. +0 −2 intern/cycles/kernel/bvh/bvh_volume.h
  33. +0 −1 intern/cycles/kernel/bvh/bvh_volume_all.h
  34. +8 −2 intern/cycles/kernel/bvh/qbvh_shadow_all.h
  35. +1 −1 intern/cycles/kernel/bvh/qbvh_subsurface.h
  36. +4 −0 intern/cycles/kernel/bvh/qbvh_traversal.h
  37. +0 −1 intern/cycles/kernel/bvh/qbvh_volume.h
  38. +0 −2 intern/cycles/kernel/bvh/qbvh_volume_all.h
  39. +2 −0 intern/cycles/kernel/geom/geom.h
  40. +4 −4 intern/cycles/kernel/geom/geom_motion_curve.h
  41. +1 −309 intern/cycles/kernel/geom/geom_motion_triangle.h
  42. +280 −0 intern/cycles/kernel/geom/geom_motion_triangle_intersect.h
  43. +123 −0 intern/cycles/kernel/geom/geom_motion_triangle_shader.h
  44. +0 −1 intern/cycles/kernel/geom/geom_object.h
  45. +3 −2 intern/cycles/kernel/geom/geom_primitive.h
  46. +8 −8 intern/cycles/kernel/geom/geom_triangle.h
  47. +1 −1 intern/cycles/kernel/kernel_bake.h
  48. +4 −1 intern/cycles/kernel/kernel_globals.h
  49. +1 −1 intern/cycles/kernel/kernel_light.h
  50. +26 −7 intern/cycles/kernel/kernel_path.h
  51. +10 −9 intern/cycles/kernel/kernel_path_branched.h
  52. +1 −1 intern/cycles/kernel/kernel_path_common.h
  53. +19 −10 intern/cycles/kernel/kernel_shader.h
  54. +390 −221 intern/cycles/kernel/kernel_shadow.h
  55. +103 −45 intern/cycles/kernel/kernel_types.h
  56. +18 −9 intern/cycles/kernel/kernels/cuda/kernel.cu
  57. +21 −1 intern/cycles/kernel/osl/osl_services.cpp
  58. +2 −0 intern/cycles/kernel/osl/osl_services.h
  59. +10 −0 intern/cycles/kernel/shaders/node_light_path.osl
  60. +7 −7 intern/cycles/kernel/split/kernel_holdout_emission_blurring_pathtermination_ao.h
  61. +2 −0 intern/cycles/kernel/svm/svm_light_path.h
  62. +29 −24 intern/cycles/kernel/svm/svm_math_util.h
  63. +2 −0 intern/cycles/kernel/svm/svm_types.h
  64. +1 −1 intern/cycles/kernel/svm/svm_wireframe.h
  65. +14 −7 intern/cycles/render/image.cpp
  66. +4 −2 intern/cycles/render/image.h
  67. +11 −0 intern/cycles/render/integrator.cpp
  68. +3 −0 intern/cycles/render/integrator.h
  69. +271 −11 intern/cycles/render/mesh.cpp
  70. +55 −1 intern/cycles/render/mesh.h
  71. +1 −1 intern/cycles/render/mesh_subdivision.cpp
  72. +18 −3 intern/cycles/render/nodes.cpp
  73. +4 −4 intern/cycles/render/object.cpp
  74. +3 −0 intern/cycles/render/scene.h
  75. +1 −1 intern/cycles/render/tile.cpp
  76. +13 −2 intern/cycles/test/CMakeLists.txt
  77. +3 −3 intern/cycles/test/render_graph_finalize_test.cpp
  78. +1 −1 intern/cycles/test/util_aligned_malloc_test.cpp
  79. +50 −50 intern/cycles/test/util_path_test.cpp
  80. +32 −32 intern/cycles/test/util_string_test.cpp
  81. +0 −2 intern/cycles/util/util_boundbox.h
  82. +22 −0 intern/cycles/util/util_math.h
  83. +3 −3 intern/cycles/util/util_version.h
  84. +1 −1 intern/utfconv/utfconv.h
  85. +11 −6 make.bat
  86. +48 −10 release/scripts/startup/bl_operators/freestyle.py
  87. +12 −0 release/scripts/startup/bl_ui/properties_animviz.py
  88. +80 −79 release/scripts/startup/bl_ui/properties_game.py
  89. +1 −1 release/scripts/startup/bl_ui/properties_render.py
  90. +1 −1 release/scripts/startup/bl_ui/space_info.py
  91. +3 −3 release/scripts/startup/bl_ui/space_outliner.py
  92. +0 −6 release/scripts/startup/bl_ui/space_sequencer.py
  93. +3 −3 release/scripts/startup/bl_ui/space_view3d.py
  94. +1 −1 release/scripts/templates_py/addon_add_object.py
  95. +1 −5 source/blender/alembic/CMakeLists.txt
  96. +5 −5 source/blender/alembic/intern/abc_curves.cc
  97. +17 −2 source/blender/alembic/intern/abc_exporter.cc
  98. +2 −3 source/blender/alembic/intern/abc_hair.cc
  99. +9 −9 source/blender/alembic/intern/abc_mesh.cc
  100. +2 −2 source/blender/alembic/intern/abc_nurbs.cc
  101. +2 −2 source/blender/alembic/intern/abc_util.cc
  102. +4 −4 source/blender/alembic/intern/abc_util.h
  103. +4 −0 source/blender/blenfont/intern/blf_thumbs.c
  104. +6 −0 source/blender/blenkernel/BKE_bvhutils.h
  105. +1 −0 source/blender/blenkernel/BKE_cdderivedmesh.h
  106. +4 −1 source/blender/blenkernel/BKE_library.h
  107. +17 −12 source/blender/blenkernel/BKE_library_query.h
  108. +23 −0 source/blender/blenkernel/BKE_main.h
  109. +3 −3 source/blender/blenkernel/BKE_modifier.h
  110. +0 −5 source/blender/blenkernel/BKE_object.h
  111. +1 −1 source/blender/blenkernel/BKE_particle.h
  112. +1 −1 source/blender/blenkernel/BKE_rigidbody.h
  113. +3 −3 source/blender/blenkernel/BKE_sca.h
  114. +7 −0 source/blender/blenkernel/BKE_texture.h
  115. +15 −0 source/blender/blenkernel/intern/DerivedMesh.c
  116. +9 −1 source/blender/blenkernel/intern/anim.c
  117. +14 −1 source/blender/blenkernel/intern/armature.c
  118. +1 −1 source/blender/blenkernel/intern/blender.c
  119. +1 −1 source/blender/blenkernel/intern/brush.c
  120. +161 −76 source/blender/blenkernel/intern/bvhutils.c
  121. +6 −2 source/blender/blenkernel/intern/cachefile.c
  122. +33 −11 source/blender/blenkernel/intern/cdderivedmesh.c
  123. +1 −1 source/blender/blenkernel/intern/customdata.c
  124. +1 −1 source/blender/blenkernel/intern/depsgraph.c
  125. +2 −6 source/blender/blenkernel/intern/lamp.c
  126. +236 −23 source/blender/blenkernel/intern/library.c
  127. +179 −157 source/blender/blenkernel/intern/library_query.c
  128. +20 −12 source/blender/blenkernel/intern/library_remap.c
  129. +1 −52 source/blender/blenkernel/intern/object.c
  130. +3 −2 source/blender/blenkernel/intern/particle.c
  131. +5 −5 source/blender/blenkernel/intern/particle_system.c
  132. +4 −4 source/blender/blenkernel/intern/rigidbody.c
  133. +22 −22 source/blender/blenkernel/intern/sca.c
  134. +2 −0 source/blender/blenkernel/intern/scene.c
  135. +54 −35 source/blender/blenkernel/intern/sequencer.c
  136. +2 −2 source/blender/blenkernel/intern/sound.c
  137. +12 −11 source/blender/blenkernel/intern/text.c
  138. +12 −3 source/blender/blenkernel/intern/texture.c
  139. +11 −11 source/blender/blenkernel/intern/tracking_util.c
  140. +1 −1 source/blender/blenlib/BLI_dynlib.h
  141. +4 −0 source/blender/blenlib/BLI_math_geom.h
  142. +2 −2 source/blender/blenlib/BLI_string_utf8.h
  143. +1 −1 source/blender/blenlib/BLI_string_utils.h
  144. +5 −0 source/blender/blenlib/BLI_sys_types.h
  145. +3 −2 source/blender/blenlib/PIL_time_utildefines.h
  146. +2 −2 source/blender/blenlib/intern/dynlib.c
  147. +28 −0 source/blender/blenlib/intern/math_geom.c
  148. +12 −6 source/blender/blenlib/intern/string_utf8.c
  149. +3 −3 source/blender/blenlib/intern/string_utils.c
  150. +10 −4 source/blender/blenloader/intern/readfile.c
  151. +2 −0 source/blender/blenloader/intern/readfile.h
  152. +101 −0 source/blender/blenloader/intern/versioning_270.c
  153. +88 −277 source/blender/blenloader/intern/writefile.c
  154. +3 −11 source/blender/bmesh/intern/bmesh_construct.c
  155. +3 −4 source/blender/bmesh/intern/bmesh_construct.h
  156. +97 −45 source/blender/bmesh/intern/bmesh_marking.c
  157. +4 −0 source/blender/bmesh/intern/bmesh_mesh_conv.c
  158. +5 −1 source/blender/bmesh/operators/bmo_create.c
  159. +9 −5 source/blender/collada/ArmatureExporter.cpp
  160. +9 −8 source/blender/compositor/nodes/COM_HueSaturationValueNode.cpp
  161. +16 −3 source/blender/compositor/operations/COM_ChangeHSVOperation.cpp
  162. +3 −8 source/blender/compositor/operations/COM_ChangeHSVOperation.h
  163. +48 −26 source/blender/depsgraph/intern/builder/deg_builder_nodes.cc
  164. +6 −4 source/blender/depsgraph/intern/builder/deg_builder_nodes.h
  165. +11 −9 source/blender/depsgraph/intern/builder/deg_builder_nodes_rig.cc
  166. +0 −14 source/blender/depsgraph/intern/builder/deg_builder_nodes_scene.cc
  167. +60 −29 source/blender/depsgraph/intern/builder/deg_builder_relations.cc
  168. +7 −5 source/blender/depsgraph/intern/builder/deg_builder_relations.h
  169. +2 −14 source/blender/depsgraph/intern/builder/deg_builder_relations_scene.cc
  170. +2 −0 source/blender/depsgraph/intern/depsgraph_build.cc
  171. +1 −1 source/blender/depsgraph/intern/depsgraph_type_defines.cc
  172. +6 −0 source/blender/depsgraph/intern/eval/deg_eval.cc
  173. +1 −1 source/blender/editors/animation/anim_filter.c
  174. +5 −0 source/blender/editors/armature/editarmature_sketch.c
  175. +3 −5 source/blender/editors/gpencil/drawgpencil.c
  176. +9 −2 source/blender/editors/gpencil/gpencil_edit.c
  177. +2 −2 source/blender/editors/gpencil/gpencil_interpolate.c
  178. +0 −4 source/blender/editors/include/ED_transform_snap_object_context.h
  179. +1 −1 source/blender/editors/interface/interface.c
  180. +1 −1 source/blender/editors/interface/interface_handlers.c
  181. +6 −2 source/blender/editors/interface/interface_layout.c
  182. +4 −2 source/blender/editors/interface/view2d_ops.c
  183. +1 −1 source/blender/editors/mesh/editmesh_tools.c
  184. +238 −206 source/blender/editors/mesh/meshtools.c
  185. +3 −3 source/blender/editors/object/object_relations.c
  186. +33 −28 source/blender/editors/object/object_vgroup.c
  187. +32 −2 source/blender/editors/space_action/action_draw.c
  188. +0 −14 source/blender/editors/space_node/drawnode.c
  189. +130 −60 source/blender/editors/space_view3d/drawanimviz.c
  190. +9 −1 source/blender/editors/space_view3d/drawarmature.c
  191. +1 −1 source/blender/editors/space_view3d/view3d_ruler.c
  192. +1 −1 source/blender/editors/space_view3d/view3d_walk.c
  193. +23 −4 source/blender/editors/transform/transform.c
  194. +2 −2 source/blender/editors/transform/transform.h
  195. +6 −1 source/blender/editors/transform/transform_conversions.c
  196. +6 −4 source/blender/editors/transform/transform_snap.c
  197. +842 −943 source/blender/editors/transform/transform_snap_object.c
  198. +1 −1 source/blender/gpu/intern/gpu_material.c
  199. +4 −0 source/blender/gpu/shaders/gpu_shader_material.glsl
  200. +12 −0 source/blender/imbuf/IMB_colormanagement.h
  201. +146 −27 source/blender/imbuf/intern/colormanagement.c
  202. +7 −1 source/blender/makesdna/DNA_action_types.h
  203. +1 −0 source/blender/makesdna/DNA_node_types.h
  204. +28 −1 source/blender/makesrna/intern/rna_animviz.c
  205. +5 −0 source/blender/makesrna/intern/rna_gpencil.c
  206. +0 −28 source/blender/makesrna/intern/rna_nodetree.c
  207. +4 −0 source/blender/modifiers/CMakeLists.txt
  208. +1 −1 source/blender/modifiers/intern/MOD_armature.c
  209. +4 −4 source/blender/modifiers/intern/MOD_array.c
  210. +1 −1 source/blender/modifiers/intern/MOD_boolean.c
  211. +1 −1 source/blender/modifiers/intern/MOD_cast.c
  212. +9 −3 source/blender/modifiers/intern/MOD_cloth.c
  213. +1 −1 source/blender/modifiers/intern/MOD_curve.c
  214. +7 −4 source/blender/modifiers/intern/MOD_datatransfer.c
  215. +134 −79 source/blender/modifiers/intern/MOD_displace.c
  216. +11 −4 source/blender/modifiers/intern/MOD_dynamicpaint.c
  217. +2 −2 source/blender/modifiers/intern/MOD_explode.c
  218. +1 −1 source/blender/modifiers/intern/MOD_hook.c
  219. +1 −1 source/blender/modifiers/intern/MOD_lattice.c
  220. +1 −1 source/blender/modifiers/intern/MOD_mask.c
  221. +1 −1 source/blender/modifiers/intern/MOD_meshdeform.c
  222. +1 −1 source/blender/modifiers/intern/MOD_meshsequencecache.c
  223. +1 −1 source/blender/modifiers/intern/MOD_mirror.c
  224. +1 −1 source/blender/modifiers/intern/MOD_normal_edit.c
  225. +1 −1 source/blender/modifiers/intern/MOD_particleinstance.c
  226. +1 −1 source/blender/modifiers/intern/MOD_screw.c
  227. +2 −2 source/blender/modifiers/intern/MOD_shrinkwrap.c
  228. +1 −1 source/blender/modifiers/intern/MOD_simpledeform.c
  229. +12 −6 source/blender/modifiers/intern/MOD_smoke.c
  230. +7 −0 source/blender/modifiers/intern/MOD_softbody.c
  231. +2 −2 source/blender/modifiers/intern/MOD_uvproject.c
  232. +2 −2 source/blender/modifiers/intern/MOD_uvwarp.c
  233. +4 −4 source/blender/modifiers/intern/MOD_warp.c
  234. +3 −3 source/blender/modifiers/intern/MOD_wave.c
  235. +2 −2 source/blender/modifiers/intern/MOD_weightvgedit.c
  236. +2 −2 source/blender/modifiers/intern/MOD_weightvgmix.c
  237. +3 −3 source/blender/modifiers/intern/MOD_weightvgproximity.c
  238. +1 −1 source/blender/nodes/NOD_static_types.h
  239. +4 −12 source/blender/nodes/composite/nodes/node_composite_hueSatVal.c
  240. +2 −0 source/blender/nodes/shader/nodes/node_shader_light_path.c
  241. +1 −1 source/blender/python/intern/bpy_rna_id_collection.c
  242. +1 −0 source/blender/python/intern/gpu.c
  243. +1 −1 source/blender/render/intern/source/pipeline.c
  244. +6 −3 source/blender/windowmanager/intern/wm_operators.c
  245. +17 −17 source/blenderplayer/bad_level_call_stubs/stubs.c
  246. +1 −1 source/creator/creator_args.c
  247. +1 −1 source/tools
  248. +3 −0 tests/gtests/CMakeLists.txt
  249. +20 −20 tests/gtests/blenlib/BLI_array_store_test.cc
  250. +18 −18 tests/gtests/blenlib/BLI_array_utils_test.cc
  251. +9 −9 tests/gtests/blenlib/BLI_ghash_performance_test.cc
  252. +17 −17 tests/gtests/blenlib/BLI_ghash_test.cc
  253. +8 −8 tests/gtests/blenlib/BLI_hash_mm2a_test.cc
  254. +13 −13 tests/gtests/blenlib/BLI_listbase_test.cc
  255. +8 −8 tests/gtests/blenlib/BLI_path_util_test.cc
  256. +5 −5 tests/gtests/blenlib/BLI_polyfill2d_test.cc
  257. +16 −16 tests/gtests/blenlib/BLI_stack_test.cc
  258. +52 −52 tests/gtests/blenlib/BLI_string_test.cc
  259. +1 −1 tests/gtests/blenlib/BLI_string_utf8_test.cc
  260. +9 −9 tests/gtests/bmesh/bmesh_core_test.cc
  261. +1 −1 tests/gtests/guardedalloc/guardedalloc_alignment_test.cc
  262. +0 −3 tests/gtests/testing/CMakeLists.txt
  263. +22 −18 tests/python/CMakeLists.txt
  264. +1 −0 tests/python/cycles_render_tests.py
@@ -725,7 +725,7 @@ if(NOT WITH_BOOST)
macro(set_and_warn
_setting _val)
if(${${_setting}})
message(STATUS "'WITH_BOOST' is disabled: forceing 'set(${_setting} ${_val})'")
message(STATUS "'WITH_BOOST' is disabled: forcing 'set(${_setting} ${_val})'")
endif()
set(${_setting} ${_val})
endmacro()
@@ -344,7 +344,7 @@ OSL_FORCE_REBUILD=false
OSL_SKIP=false

# OpenSubdiv needs to be compiled for now
OSD_VERSION="3.1.0"
OSD_VERSION="3.1.1"
OSD_VERSION_MIN=$OSD_VERSION
OSD_FORCE_BUILD=false
OSD_FORCE_REBUILD=false
@@ -795,7 +795,7 @@ CXXFLAGS_BACK=$CXXFLAGS
if [ "$USE_CXX11" = true ]; then
WARNING "You are trying to use c++11, this *should* go smoothely with any very recent distribution
However, if you are experiencing linking errors (also when building Blender itself), please try the following:
* Re-run this script with `--build-all --force-all` options.
* Re-run this script with '--build-all --force-all' options.
* Ensure your gcc version is at the very least 4.8, if possible you should really rather use gcc-5.1 or above.
Please note that until the transition to C++11-built libraries if completed in your distribution, situation will
@@ -72,10 +72,8 @@ def parse_header_file(filename, define):
# Set up OSX architecture
if builder.endswith('x86_64_10_6_cmake'):
cmake_extra_options.append('-DCMAKE_OSX_ARCHITECTURES:STRING=x86_64')
cmake_extra_options.append('-DCUDA_NVCC_EXECUTABLE=/usr/local/cuda8-hack/bin/nvcc')
cmake_extra_options.append('-DWITH_CODEC_QUICKTIME=OFF')
cmake_extra_options.append('-DCMAKE_OSX_DEPLOYMENT_TARGET=10.6')
build_cubins = False


elif builder.startswith('win'):
@@ -45,7 +45,7 @@ macro(BLENDER_SRC_GTEST_EX NAME SRC EXTRA_LIBS DO_ADD_TEST)
RUNTIME_OUTPUT_DIRECTORY_DEBUG "${TESTS_OUTPUT_DIR}"
INCLUDE_DIRECTORIES "${TEST_INC}")
if(${DO_ADD_TEST})
add_test(${NAME}_test ${TESTS_OUTPUT_DIR}/${NAME}_test)
add_test(NAME ${NAME}_test COMMAND ${TESTS_OUTPUT_DIR}/${NAME}_test WORKING_DIRECTORY $<TARGET_FILE_DIR:blender>)
endif()
endif()
endmacro()
@@ -416,14 +416,7 @@ function(setup_liblinks
target_link_libraries(${target} ${OPENCOLORIO_LIBRARIES})
endif()
if(WITH_OPENSUBDIV OR WITH_CYCLES_OPENSUBDIV)
if(WIN32 AND NOT UNIX)
file_list_suffix(OPENSUBDIV_LIBRARIES_DEBUG "${OPENSUBDIV_LIBRARIES}" "_d")
target_link_libraries_debug(${target} "${OPENSUBDIV_LIBRARIES_DEBUG}")
target_link_libraries_optimized(${target} "${OPENSUBDIV_LIBRARIES}")
unset(OPENSUBDIV_LIBRARIES_DEBUG)
else()
target_link_libraries(${target} ${OPENSUBDIV_LIBRARIES})
endif()
endif()
if(WITH_OPENVDB)
target_link_libraries(${target} ${OPENVDB_LIBRARIES} ${TBB_LIBRARIES})
@@ -446,10 +446,20 @@ if(WITH_MOD_CLOTH_ELTOPO)
endif()

if(WITH_OPENSUBDIV OR WITH_CYCLES_OPENSUBDIV)
set(OPENSUBDIV_INCLUDE_DIR ${LIBDIR}/opensubdiv/include)
set(OPENSUBDIV_LIBPATH ${LIBDIR}/opensubdiv/lib)
set(OPENSUBDIV_LIBRARIES ${OPENSUBDIV_LIBPATH}/osdCPU.lib ${OPENSUBDIV_LIBPATH}/osdGPU.lib)
find_package(OpenSubdiv)
set(OPENSUBDIV_INCLUDE_DIR ${LIBDIR}/opensubdiv/include)
set(OPENSUBDIV_LIBPATH ${LIBDIR}/opensubdiv/lib)
set(OPENSUBDIV_LIBRARIES optimized ${OPENSUBDIV_LIBPATH}/osdCPU.lib
optimized ${OPENSUBDIV_LIBPATH}/osdGPU.lib
debug ${OPENSUBDIV_LIBPATH}/osdCPU_d.lib
debug ${OPENSUBDIV_LIBPATH}/osdGPU_d.lib
)
set(OPENSUBDIV_HAS_OPENMP TRUE)
set(OPENSUBDIV_HAS_TBB FALSE)
set(OPENSUBDIV_HAS_OPENCL TRUE)
set(OPENSUBDIV_HAS_CUDA FALSE)
set(OPENSUBDIV_HAS_GLSL_TRANSFORM_FEEDBACK TRUE)
set(OPENSUBDIV_HAS_GLSL_COMPUTE TRUE)
windows_find_package(OpenSubdiv)
endif()

if(WITH_SDL)
@@ -1632,13 +1632,9 @@ def write_sphinx_conf_py(basepath):
file = open(filepath, "w", encoding="utf-8")
fw = file.write

fw("import sys, os\n")
fw("\n")
fw("extensions = ['sphinx.ext.intersphinx']\n")
fw("\n")
fw("intersphinx_mapping = {'blender_manual': ('https://www.blender.org/manual/', None)}\n")
fw("\n")

fw("import sys, os\n\n")
fw("extensions = ['sphinx.ext.intersphinx']\n\n")
fw("intersphinx_mapping = {'blender_manual': ('https://docs.blender.org/manual/en/dev/', None)}\n\n")
fw("project = 'Blender'\n")
# fw("master_doc = 'index'\n")
fw("copyright = u'Blender Foundation'\n")
@@ -1655,6 +1651,7 @@ def write_sphinx_conf_py(basepath):

# not helpful since the source is generated, adds to upload size.
fw("html_copy_source = False\n")
fw("html_show_sphinx = False\n")
fw("html_split_index = True\n")
fw("\n")

@@ -41,9 +41,9 @@
import zipfile


DEFAULT_RSYNC_SERVER = "www.blender.org"
DEFAULT_RSYNC_SERVER = "docs.blender.org"
DEFAULT_RSYNC_ROOT = "/api/"
DEFAULT_SYMLINK_ROOT = "/data/www/vhosts/www.blender.org/api"
DEFAULT_SYMLINK_ROOT = "/data/www/vhosts/docs.blender.org/api"


def argparse_create():
@@ -18,6 +18,8 @@ Local modifications:
- Applied some modifications from fork https://github.com/Nazg-Gul/gflags.git
(see https://github.com/gflags/gflags/pull/129)

- Avoid attemot of acquiring mutex lock in FlagRegistry::GlobalRegistry when
- Avoid attempt of acquiring mutex lock in FlagRegistry::GlobalRegistry when
doing static flags initialization. See d81dd2d in Blender repository.

- Made `google::{anonymous}::FlagValue::ValueSize() const` inlined, so it does
not trigger strict compiler warning.
@@ -218,7 +218,7 @@ class FlagValue {
bool Equal(const FlagValue& x) const;
FlagValue* New() const; // creates a new one with default value
void CopyFrom(const FlagValue& x);
int ValueSize() const;
inline int ValueSize() const;

// Calls the given validate-fn on value_buffer_, and returns
// whatever it returns. But first casts validate_fn_proto to a
@@ -443,7 +443,7 @@ void FlagValue::CopyFrom(const FlagValue& x) {
}
}

int FlagValue::ValueSize() const {
inline int FlagValue::ValueSize() const {
if (type_ > FV_MAX_INDEX) {
assert(false); // unknown type
return 0;
@@ -62,7 +62,7 @@ if(WITH_IK_ITASC)
add_subdirectory(itasc)
endif()

if(WITH_IK_SOLVER OR WITH_GAMEENGINE OR WITH_MOD_BOOLEAN)
if(WITH_GAMEENGINE)
add_subdirectory(moto)
endif()

@@ -74,7 +74,6 @@ elseif(CMAKE_COMPILER_IS_GNUCC)
if(CXX_HAS_AVX2)
set(CYCLES_AVX2_KERNEL_FLAGS "-ffast-math -msse -msse2 -msse3 -mssse3 -msse4.1 -mavx -mavx2 -mfma -mlzcnt -mbmi -mbmi2 -mf16c -mfpmath=sse")
endif()
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -ffast-math")
elseif(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
check_cxx_compiler_flag(-msse CXX_HAS_SSE)
check_cxx_compiler_flag(-mavx CXX_HAS_AVX)
@@ -90,7 +89,6 @@ elseif(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
if(CXX_HAS_AVX2)
set(CYCLES_AVX2_KERNEL_FLAGS "-ffast-math -msse -msse2 -msse3 -mssse3 -msse4.1 -mavx -mavx2 -mfma -mlzcnt -mbmi -mbmi2 -mf16c")
endif()
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -ffast-math")
endif()

if(CXX_HAS_SSE)
@@ -23,11 +23,25 @@
"location": "Info header, render engine menu",
"description": "Cycles Render Engine integration",
"warning": "",
"wiki_url": "https://www.blender.org/manual/render/cycles/index.html",
"wiki_url": "https://docs.blender.org/manual/en/dev/render/cycles/",
"tracker_url": "",
"support": 'OFFICIAL',
"category": "Render"}

# Support 'reload' case.
if "bpy" in locals():
import importlib
if "engine" in locals():
importlib.reload(engine)
if "version_update" in locals():
importlib.reload(version_update)
if "ui" in locals():
importlib.reload(ui)
if "properties" in locals():
importlib.reload(properties)
if "presets" in locals():
importlib.reload(presets)

import bpy

from . import (
@@ -62,7 +62,7 @@ def _parse_command_line():
num_resumable_chunks = None
current_resumable_chunk = None

# TODO(sergey): Add some nice error ptins if argument is not used properly.
# TODO(sergey): Add some nice error prints if argument is not used properly.
idx = 0
while idx < len(argv) - 1:
arg = argv[idx]
@@ -528,6 +528,12 @@ def register(cls):
description="Use special type BVH optimized for hair (uses more ram but renders faster)",
default=True,
)
cls.debug_bvh_time_steps = IntProperty(
name="BVH Time Steps",
description="Split BVH primitives by this number of time steps to speed up render time in cost of memory",
default=0,
min=0, max=16,
)
cls.tile_order = EnumProperty(
name="Tile Order",
description="Tile order for rendering",
@@ -632,6 +638,20 @@ def register(cls):
items=enum_texture_limit
)

cls.ao_bounces = IntProperty(
name="AO Bounces",
default=0,
description="Approximate indirect light with background tinted ambient occlusion at the specified bounce, 0 disables this feature",
min=0, max=1024,
)

cls.ao_bounces_render = IntProperty(
name="AO Bounces Render",
default=0,
description="Approximate indirect light with background tinted ambient occlusion at the specified bounce, 0 disables this feature",
min=0, max=1024,
)

# Various fine-tuning debug flags

def devices_update_callback(self, context):
@@ -253,7 +253,7 @@ def draw(self, context):
draw_samples_info(layout, context)


class CyclesRender_PT_geometery(CyclesButtonsPanel, Panel):
class CyclesRender_PT_geometry(CyclesButtonsPanel, Panel):
bl_label = "Geometry"
bl_options = {'DEFAULT_CLOSED'}

@@ -488,6 +488,10 @@ def draw(self, context):
col.prop(cscene, "debug_use_spatial_splits")
col.prop(cscene, "debug_use_hair_bvh")

row = col.row()
row.active = not cscene.debug_use_spatial_splits
row.prop(cscene, "debug_bvh_time_steps")


class CyclesRender_PT_layer_options(CyclesButtonsPanel, Panel):
bl_label = "Layer"
@@ -843,10 +847,13 @@ def draw(self, context):
col = layout.column()
col.label(text="Performance:")
row = col.row()
row.active = scene.render.use_simplify and cscene.use_camera_cull
row.prop(cob, "use_camera_cull")
row.active = scene.render.use_simplify and cscene.use_distance_cull
row.prop(cob, "use_distance_cull")
sub = row.row()
sub.active = scene.render.use_simplify and cscene.use_camera_cull
sub.prop(cob, "use_camera_cull")

sub = row.row()
sub.active = scene.render.use_simplify and cscene.use_distance_cull
sub.prop(cob, "use_distance_cull")


class CYCLES_OT_use_shading_nodes(Operator):
@@ -1089,10 +1096,11 @@ def draw(self, context):
layout = self.layout

light = context.world.light_settings
scene = context.scene

row = layout.row()
sub = row.row()
sub.active = light.use_ambient_occlusion
sub.active = light.use_ambient_occlusion or scene.render.use_simplify
sub.prop(light, "ao_factor", text="Factor")
row.prop(light, "distance", text="Distance")

@@ -1684,6 +1692,13 @@ def draw(self, context):
row.active = cscene.use_distance_cull
row.prop(cscene, "distance_cull_margin", text="Distance")

split = layout.split()
col = split.column()
col.prop(cscene, "ao_bounces")

col = split.column()
col.prop(cscene, "ao_bounces_render")

def draw_device(self, context):
scene = context.scene
layout = self.layout
@@ -927,6 +927,13 @@ Mesh *BlenderSync::sync_mesh(BL::Object& b_ob,

mesh->subdivision_type = object_subdivision_type(b_ob, preview, experimental);

/* Disable adaptive subdivision while baking as the baking system
* currently doesnt support the topology and will crash.
*/
if(scene->bake_manager->get_baking()) {
mesh->subdivision_type = Mesh::SUBDIVISION_NONE;
}

BL::Mesh b_mesh = object_to_mesh(b_data,
b_ob,
b_scene,
@@ -1352,6 +1352,9 @@ void BlenderSession::update_resumable_tile_manager(int num_samples)
VLOG(1) << "Samples range start is " << range_start_sample << ", "
<< "number of samples to render is " << range_num_samples;

scene->integrator->start_sample = range_start_sample;
scene->integrator->tag_update(scene);

session->tile_manager.range_start_sample = range_start_sample;
session->tile_manager.range_num_samples = range_num_samples;
}
@@ -640,7 +640,8 @@ static ShaderNode *add_node(Scene *scene,
image->filename.string(),
image->builtin_data,
get_image_interpolation(b_image_node),
get_image_extension(b_image_node));
get_image_extension(b_image_node),
image->use_alpha);
}
}
image->color_space = (NodeImageColorSpace)b_image_node.color_space();
@@ -686,7 +687,8 @@ static ShaderNode *add_node(Scene *scene,
env->filename.string(),
env->builtin_data,
get_image_interpolation(b_env_node),
EXTENSION_REPEAT);
EXTENSION_REPEAT,
env->use_alpha);
}
}
env->color_space = (NodeImageColorSpace)b_env_node.color_space();
@@ -823,7 +825,8 @@ static ShaderNode *add_node(Scene *scene,
point_density->filename.string(),
point_density->builtin_data,
point_density->interpolation,
EXTENSION_CLIP);
EXTENSION_CLIP,
true);
}
node = point_density;

@@ -322,6 +322,15 @@ void BlenderSync::sync_integrator()
integrator->volume_samples = volume_samples;
}

if(b_scene.render().use_simplify()) {
if(preview) {
integrator->ao_bounces = get_int(cscene, "ao_bounces");
}
else {
integrator->ao_bounces = get_int(cscene, "ao_bounces_render");
}
}

if(integrator->modified(previntegrator))
integrator->tag_update(scene);
}
@@ -498,6 +507,7 @@ SceneParams BlenderSync::get_scene_params(BL::Scene& b_scene,

params.use_bvh_spatial_split = RNA_boolean_get(&cscene, "debug_use_spatial_splits");
params.use_bvh_unaligned_nodes = RNA_boolean_get(&cscene, "debug_use_hair_bvh");
params.num_bvh_time_steps = RNA_int_get(&cscene, "debug_bvh_time_steps");

if(background && params.shadingsystem != SHADINGSYSTEM_OSL)
params.persistent_data = r.use_persistent_data();

0 comments on commit b9ec5af

Please sign in to comment.
You can’t perform that action at this time.