[Bf-blender-cvs] [eab72c52429] sculpt-mode-features: Merge commit 'e12c08e8d170b7ca40f204a5b0423c23a9fbc2c1^1' into sculpt-mode-features
Pablo Dobarro
noreply at git.blender.org
Tue Apr 23 20:25:27 CEST 2019
Commit: eab72c52429596df978e5af4a9975079c1854848
Author: Pablo Dobarro
Date: Tue Apr 23 17:50:58 2019 +0200
Branches: sculpt-mode-features
https://developer.blender.org/rBeab72c52429596df978e5af4a9975079c1854848
Merge commit 'e12c08e8d170b7ca40f204a5b0423c23a9fbc2c1^1' into sculpt-mode-features
===================================================================
===================================================================
diff --cc build_files/cmake/macros.cmake
index d88b5c04ce2,22e53fecf50..90f07e7edc7
--- a/build_files/cmake/macros.cmake
+++ b/build_files/cmake/macros.cmake
@@@ -539,270 -539,6 +546,269 @@@ function(setup_liblink
target_link_libraries(${target} ${PLATFORM_LINKLIBS})
endfunction()
-
+function(SETUP_BLENDER_SORTED_LIBS)
+
+ get_property(BLENDER_LINK_LIBS GLOBAL PROPERTY BLENDER_LINK_LIBS)
+
+ list(APPEND BLENDER_LINK_LIBS
+ bf_windowmanager
+ bf_render
+ )
+
+ if(WITH_MOD_FLUID)
+ list(APPEND BLENDER_LINK_LIBS bf_intern_elbeem)
+ endif()
+
+ if(WITH_CYCLES)
+ list(APPEND BLENDER_LINK_LIBS
+ cycles_render
+ cycles_graph
+ cycles_bvh
+ cycles_device
+ cycles_kernel
+ cycles_util
+ cycles_subd)
+ if(WITH_CYCLES_OSL)
+ list(APPEND BLENDER_LINK_LIBS cycles_kernel_osl)
+ endif()
+ endif()
+
+ if(WITH_AUDASPACE AND NOT WITH_SYSTEM_AUDASPACE)
+ list(APPEND BLENDER_LINK_LIBS
+ audaspace
+ audaspace-py)
+ endif()
+
+ # Sort libraries
+ set(BLENDER_SORTED_LIBS
+ bf_windowmanager
+
+ bf_editor_undo
+
+ bf_editor_space_api
+ bf_editor_space_action
+ bf_editor_space_buttons
+ bf_editor_space_console
+ bf_editor_space_file
+ bf_editor_space_graph
+ bf_editor_space_image
+ bf_editor_space_info
+ bf_editor_space_logic
+ bf_editor_space_nla
+ bf_editor_space_node
+ bf_editor_space_outliner
+ bf_editor_space_script
+ bf_editor_space_sequencer
+ bf_editor_space_statusbar
+ bf_editor_space_text
+ bf_editor_space_time
+ bf_editor_space_topbar
+ bf_editor_space_userpref
+ bf_editor_space_view3d
+ bf_editor_space_clip
+
+ bf_editor_transform
+ bf_editor_uvedit
+ bf_editor_curve
+ bf_editor_interface
+ bf_editor_gizmo_library
+ bf_editor_mesh
+ bf_editor_metaball
+ bf_editor_object
+ bf_editor_gpencil
+ bf_editor_lattice
+ bf_editor_armature
+ bf_editor_physics
+ bf_editor_render
+ bf_editor_scene
+ bf_editor_screen
+ bf_editor_sculpt_paint
+ bf_editor_sound
+ bf_editor_animation
+ bf_editor_datafiles
+ bf_editor_mask
+ bf_editor_io
+ bf_editor_util
+
+ bf_render
+ bf_python
+ bf_python_ext
+ bf_python_mathutils
+ bf_python_gpu
+ bf_python_bmesh
+ bf_freestyle
+ bf_ikplugin
+ bf_modifiers
+ bf_gpencil_modifiers
+ bf_alembic
+ bf_bmesh
+ bf_gpu
+ bf_draw
+ bf_blenloader
+ bf_blenkernel
+ bf_shader_fx
+ bf_gpencil_modifiers
+ bf_physics
+ bf_nodes
+ bf_rna
+ bf_editor_gizmo_library # rna -> gizmo bad-level calls
+ bf_python
+ bf_imbuf
+ bf_blenlib
+ bf_depsgraph
+ bf_intern_ghost
+ bf_intern_string
+ bf_avi
+ bf_imbuf_cineon
+ bf_imbuf_openexr
+ bf_imbuf_openimageio
+ bf_imbuf_dds
+ bf_collada
+ bf_intern_elbeem
+ bf_intern_memutil
+ bf_intern_guardedalloc
+ bf_intern_ctr
+ bf_intern_utfconv
+ bf_intern_smoke
+ extern_lzma
+ extern_curve_fit_nd
+ bf_intern_moto
+ extern_openjpeg
+ bf_dna
+
+ bf_blenfont
+ bf_gpu # duplicate for blenfont
+ bf_blentranslation
+ bf_intern_audaspace
+ audaspace
+ audaspace-py
+ bf_intern_mikktspace
+ bf_intern_dualcon
+ bf_intern_cycles
+ cycles_device
+ cycles_render
+ cycles_graph
+ cycles_bvh
+ cycles_kernel
+ cycles_util
+ cycles_subd
+ bf_intern_opencolorio
+ bf_intern_gawain
+ bf_intern_eigen
+ extern_rangetree
+ extern_wcwidth
+ bf_intern_libmv
+ extern_sdlew
+
+ bf_intern_glew_mx
+ bf_intern_clog
+ bf_intern_opensubdiv
+ bf_intern_numaapi
+ )
+
+ if(NOT WITH_SYSTEM_GLOG)
+ list(APPEND BLENDER_SORTED_LIBS extern_glog)
+ endif()
+
+ if(NOT WITH_SYSTEM_GFLAGS)
+ list(APPEND BLENDER_SORTED_LIBS extern_gflags)
+ endif()
+
+ if(WITH_COMPOSITOR)
+ # added for opencl compositor
+ list_insert_before(BLENDER_SORTED_LIBS "bf_blenkernel" "bf_compositor")
+ list_insert_after(BLENDER_SORTED_LIBS "bf_compositor" "bf_intern_opencl")
+ endif()
+
+ if(WITH_LIBMV)
+ list(APPEND BLENDER_SORTED_LIBS extern_ceres)
+ endif()
+
+ if(WITH_MOD_CLOTH_ELTOPO)
+ list(APPEND BLENDER_SORTED_LIBS extern_eltopo)
+ endif()
+
+ if(NOT WITH_SYSTEM_LZO)
+ list(APPEND BLENDER_SORTED_LIBS extern_minilzo)
+ endif()
+
+ if(NOT WITH_SYSTEM_GLEW)
+ list(APPEND BLENDER_SORTED_LIBS ${BLENDER_GLEW_LIBRARIES})
+ endif()
+
+ if(WITH_BINRELOC)
+ list(APPEND BLENDER_SORTED_LIBS extern_binreloc)
+ endif()
+
+ if(WITH_CXX_GUARDEDALLOC)
+ list(APPEND BLENDER_SORTED_LIBS bf_intern_guardedalloc_cpp)
+ endif()
+
+ if(WITH_IK_SOLVER)
+ list_insert_after(BLENDER_SORTED_LIBS "bf_intern_elbeem" "bf_intern_iksolver")
+ endif()
+
+ if(WITH_IK_ITASC)
+ list(APPEND BLENDER_SORTED_LIBS bf_intern_itasc)
+ endif()
+
+ if(WITH_GHOST_XDND)
+ list(APPEND BLENDER_SORTED_LIBS extern_xdnd)
+ endif()
+
+ if(WITH_CYCLES_OSL)
+ list_insert_after(BLENDER_SORTED_LIBS "cycles_kernel" "cycles_kernel_osl")
+ endif()
+
+ if(WITH_INTERNATIONAL)
+ list(APPEND BLENDER_SORTED_LIBS bf_intern_locale)
+ endif()
+
+ if(WITH_BULLET)
+ list_insert_after(BLENDER_SORTED_LIBS "bf_blenkernel" "bf_intern_rigidbody")
+ endif()
+
+ if(WITH_BULLET AND NOT WITH_SYSTEM_BULLET)
+ list_insert_after(BLENDER_SORTED_LIBS "extern_openjpeg" "extern_bullet")
+ endif()
+
+ if(WIN32)
+ list(APPEND BLENDER_SORTED_LIBS bf_intern_gpudirect)
+ endif()
+
+ if(WITH_OPENVDB)
+ list(APPEND BLENDER_SORTED_LIBS bf_intern_openvdb)
+ endif()
+
+ if(WITH_QEX)
+ list(APPEND BLENDER_SORTED_LIBS bf_intern_qex)
+ endif()
+
+ foreach(SORTLIB ${BLENDER_SORTED_LIBS})
+ set(REMLIB ${SORTLIB})
+ foreach(SEARCHLIB ${BLENDER_LINK_LIBS})
+ if(${SEARCHLIB} STREQUAL ${SORTLIB})
+ set(REMLIB "")
+ endif()
+ endforeach()
+ if(REMLIB)
+ # message(STATUS "Removing library ${REMLIB} from blender linking because: not configured")
+ list(APPEND REM_MSG ${REMLIB})
+ list(REMOVE_ITEM BLENDER_SORTED_LIBS ${REMLIB})
+ endif()
+ endforeach()
+ if(REM_MSG)
+ list(SORT REM_MSG)
+ message(STATUS "Blender Skipping: (${REM_MSG})")
+ endif()
+
+
+ set(BLENDER_SORTED_LIBS ${BLENDER_SORTED_LIBS} PARENT_SCOPE)
+
+ # for top-level tests
+ set_property(GLOBAL PROPERTY BLENDER_SORTED_LIBS_PROP ${BLENDER_SORTED_LIBS})
+endfunction()
+
macro(TEST_SSE_SUPPORT
_sse_flags
_sse2_flags)
diff --cc source/blender/blenloader/intern/readfile.c
index 810972efac8,2543271e691..4e737f9f89f
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@@ -5786,15 -5786,6 +5786,14 @@@ static void direct_link_modifiers(FileD
}
}
}
+ else if (md->type == eModifierType_Multires) {
+ MultiresModifierData *mmd = (MultiresModifierData *)md;
- mmd->subdiv = NULL;
+ }
+ else if (md->type == eModifierType_Remesh) {
+ RemeshModifierData *rmd = (RemeshModifierData *)md;
+ link_list(fd, &rmd->csg_operands);
+ rmd->mesh_cached = newdataadr(fd, rmd->mesh_cached);
+ }
}
}
diff --cc source/blender/editors/object/CMakeLists.txt
index 90294bc6f67,75d2fada7f3..c8e35b03963
--- a/source/blender/editors/object/CMakeLists.txt
+++ b/source/blender/editors/object/CMakeLists.txt
@@@ -79,17 -84,4 +85,17 @@@ if(WITH_INTERNATIONAL
add_definitions(-DWITH_INTERNATIONAL)
endif()
+if(WITH_OPENVDB)
+ add_definitions(-DWITH_OPENVDB)
+ list(APPEND INC
+ ../../../../intern/openvdb
+ )
+
+ if(WITH_OPENVDB_BLOSC)
+ add_definitions(
+ -DWITH_OPENVDB_BLOSC
+ )
+ endif()
+endif()
+
- blender_add_lib(bf_editor_object "${SRC}" "${INC}" "${INC_SYS}")
+ blender_add_lib(bf_editor_object "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")
diff --cc source/blender/editors/sculpt_paint/paint_cursor.c
index 90010693222,4b714e03d3b..b83bd353ad0
--- a/source/blender/editors/sculpt_paint/paint_cursor.c
+++ b/source/blender/editors/sculpt_paint/paint_cursor.c
@@@ -802,10 -796,9 +802,11 @@@ static bool paint_draw_alpha_overlay
UnifiedPaintSettings *ups, Brush *brush,
ViewContext *vc, int x, int y, float zoom, ePaintMode mode)
{
- /* color means that primary brush texture is colured and
- /* Color means that primary brush texture is colored and
- * secondary is used for alpha/mask control. */
- bool col = ELEM(mode, PAINT_MODE_TEXTURE_3D, PAINT_MODE_TEXTURE_2D, PAINT_MODE_VERTEX);
++ /* Color means that primary brush texture is colured and
+ * secondary is used for alpha/mask control */
+ bool col = ELEM(mode, PAINT_MODE_TEXTURE_3D, PAINT_MODE_TEXTURE_2D, PAINT_MODE_VERTEX) ? true : false;
+ bool alpha_active = false;
++
eOverlayControlFlags flags = BKE_paint_get_overlay_flags();
gpuPushAttr(GPU_DEPTH_BUFFER_BIT | GPU_BLEND_BIT);
More information about the Bf-blender-cvs
mailing list