c02f3c94d9
Opacity modifier implementation based on GP2. Functionality is largely unchanged. _Color Mode_ is either `Stroke` or `Fill` for modifying color opacity or `Hardness`. _Uniform Opacity_ does two things at once (!): - Sets the same opacity value for every point in a stroke. - Sets opacity as an absolute value rather than a factor. _Weight as Factor_ (button to the right of Opacity Factor): Use the vertex group as opacity __factor__ rather than an overall __influence__. This is confusing and hard to convey, but copies behavior from GP2. The _Influence_ panel contains the same filter settings as the GP2 modifier, with some small changes: - _Layer_ selects only strokes in the respective layer (with an _Invert_ option) - _Material_ selects only points with the respective material (with an _Invert_ option) - _Layer Pass_ and _Material Pass_ select only strokes/points which are rendered in the respective pass. _Note 1: Layers don't have UI for setting a pass yet, this will be a generic layer attribute. This can be set through the API for testing._ _Note 2: In GP2 a pass value of zero was used to disable pass filters. Since zero is a valid pass ID an explicit flag has been added for the purpose of turning pass filters on and off._ - _Vertex Group_: This can be used as an additional influence filter on points. If _Weight as Factor_ is enable the vertex group instead replaces the opacity factor. In _Fill_ mode the vertex group weight of the stroke's first point is used as influence for the entire stroke. - _Custom Curve_ is another possible influence factor per point. The curve input value is the relative position of a point along its stroke. The Influence settings have been moved into a separate DNA struct, which should help with reusability in various modifiers. Various utility functions can be found int `MOD_grease_pencil_util.hh` for handling influence settings and generating `IndexMasks` for modernized C++ code. Pull Request: https://projects.blender.org/blender/blender/pulls/116946
225 lines
4.3 KiB
CMake
225 lines
4.3 KiB
CMake
# SPDX-FileCopyrightText: 2006 Blender Authors
|
|
#
|
|
# SPDX-License-Identifier: GPL-2.0-or-later
|
|
|
|
set(INC
|
|
.
|
|
intern
|
|
../blenkernel
|
|
../blenloader
|
|
../blentranslation
|
|
../bmesh
|
|
../editors/include
|
|
../functions
|
|
../geometry
|
|
../makesrna
|
|
../nodes
|
|
../render
|
|
../windowmanager
|
|
../../../intern/eigen
|
|
|
|
# RNA_prototypes.h
|
|
${CMAKE_BINARY_DIR}/source/blender/makesrna
|
|
)
|
|
|
|
set(INC_SYS
|
|
${ZLIB_INCLUDE_DIRS}
|
|
)
|
|
|
|
set(SRC
|
|
intern/MOD_armature.cc
|
|
intern/MOD_array.cc
|
|
intern/MOD_bevel.cc
|
|
intern/MOD_boolean.cc
|
|
intern/MOD_build.cc
|
|
intern/MOD_cast.cc
|
|
intern/MOD_cloth.cc
|
|
intern/MOD_collision.cc
|
|
intern/MOD_correctivesmooth.cc
|
|
intern/MOD_curve.cc
|
|
intern/MOD_datatransfer.cc
|
|
intern/MOD_decimate.cc
|
|
intern/MOD_displace.cc
|
|
intern/MOD_dynamicpaint.cc
|
|
intern/MOD_edgesplit.cc
|
|
intern/MOD_explode.cc
|
|
intern/MOD_fluid.cc
|
|
intern/MOD_grease_pencil_opacity.cc
|
|
intern/MOD_grease_pencil_util.cc
|
|
intern/MOD_hook.cc
|
|
intern/MOD_laplaciandeform.cc
|
|
intern/MOD_laplaciansmooth.cc
|
|
intern/MOD_lattice.cc
|
|
intern/MOD_mask.cc
|
|
intern/MOD_mesh_to_volume.cc
|
|
intern/MOD_meshcache.cc
|
|
intern/MOD_meshcache_mdd.cc
|
|
intern/MOD_meshcache_pc2.cc
|
|
intern/MOD_meshcache_util.cc
|
|
intern/MOD_meshdeform.cc
|
|
intern/MOD_meshsequencecache.cc
|
|
intern/MOD_mirror.cc
|
|
intern/MOD_multires.cc
|
|
intern/MOD_nodes.cc
|
|
intern/MOD_none.cc
|
|
intern/MOD_normal_edit.cc
|
|
intern/MOD_ocean.cc
|
|
intern/MOD_particleinstance.cc
|
|
intern/MOD_particlesystem.cc
|
|
intern/MOD_remesh.cc
|
|
intern/MOD_screw.cc
|
|
intern/MOD_shapekey.cc
|
|
intern/MOD_shrinkwrap.cc
|
|
intern/MOD_simpledeform.cc
|
|
intern/MOD_skin.cc
|
|
intern/MOD_smooth.cc
|
|
intern/MOD_softbody.cc
|
|
intern/MOD_solidify.cc
|
|
intern/MOD_solidify_extrude.cc
|
|
intern/MOD_solidify_nonmanifold.cc
|
|
intern/MOD_subsurf.cc
|
|
intern/MOD_surface.cc
|
|
intern/MOD_surfacedeform.cc
|
|
intern/MOD_triangulate.cc
|
|
intern/MOD_ui_common.cc
|
|
intern/MOD_util.cc
|
|
intern/MOD_uvproject.cc
|
|
intern/MOD_uvwarp.cc
|
|
intern/MOD_volume_displace.cc
|
|
intern/MOD_volume_to_mesh.cc
|
|
intern/MOD_warp.cc
|
|
intern/MOD_wave.cc
|
|
intern/MOD_weighted_normal.cc
|
|
intern/MOD_weightvg_util.cc
|
|
intern/MOD_weightvgedit.cc
|
|
intern/MOD_weightvgmix.cc
|
|
intern/MOD_weightvgproximity.cc
|
|
intern/MOD_weld.cc
|
|
intern/MOD_wireframe.cc
|
|
|
|
MOD_modifiertypes.hh
|
|
MOD_nodes.hh
|
|
intern/MOD_grease_pencil_util.hh
|
|
intern/MOD_meshcache_util.hh
|
|
intern/MOD_solidify_util.hh
|
|
intern/MOD_ui_common.hh
|
|
intern/MOD_util.hh
|
|
intern/MOD_weightvg_util.hh
|
|
)
|
|
|
|
set(LIB
|
|
PRIVATE bf::blenfont
|
|
bf_blenkernel
|
|
PRIVATE bf::blenlib
|
|
PRIVATE bf::depsgraph
|
|
PUBLIC bf::dna
|
|
PRIVATE bf::intern::guardedalloc
|
|
)
|
|
|
|
if(WITH_ALEMBIC)
|
|
add_definitions(-DWITH_ALEMBIC)
|
|
list(APPEND INC
|
|
../io/alembic
|
|
)
|
|
list(APPEND LIB
|
|
bf_io_alembic
|
|
)
|
|
endif()
|
|
|
|
if(WITH_USD)
|
|
add_definitions(-DWITH_USD)
|
|
list(APPEND INC
|
|
../io/usd
|
|
)
|
|
list(APPEND LIB
|
|
bf_io_usd
|
|
)
|
|
endif()
|
|
|
|
if(WITH_MOD_REMESH)
|
|
list(APPEND INC
|
|
../../../intern/dualcon
|
|
)
|
|
list(APPEND LIB
|
|
bf_intern_dualcon
|
|
)
|
|
add_definitions(-DWITH_MOD_REMESH)
|
|
endif()
|
|
|
|
if(WITH_MOD_FLUID)
|
|
add_definitions(-DWITH_FLUID)
|
|
endif()
|
|
|
|
if(WITH_MOD_OCEANSIM)
|
|
add_definitions(-DWITH_OCEANSIM)
|
|
endif()
|
|
|
|
if(WITH_OPENSUBDIV)
|
|
add_definitions(-DWITH_OPENSUBDIV)
|
|
endif()
|
|
|
|
if(WITH_BULLET)
|
|
list(APPEND LIB
|
|
${BULLET_LIBRARIES}
|
|
)
|
|
add_definitions(-DWITH_BULLET)
|
|
endif()
|
|
|
|
# To disable adaptive subdivision test in subsurf UI without cycles
|
|
if(WITH_CYCLES)
|
|
add_definitions(-DWITH_CYCLES)
|
|
endif()
|
|
|
|
if(WITH_GMP)
|
|
add_definitions(-DWITH_GMP)
|
|
|
|
list(APPEND INC_SYS
|
|
${GMP_INCLUDE_DIRS}
|
|
)
|
|
|
|
list(APPEND LIB
|
|
${GMP_LIBRARIES}
|
|
)
|
|
endif()
|
|
|
|
if(WITH_TBB)
|
|
add_definitions(-DWITH_TBB)
|
|
if(WIN32)
|
|
# TBB includes Windows.h which will define min/max macros
|
|
# that will collide with the stl versions.
|
|
add_definitions(-DNOMINMAX)
|
|
endif()
|
|
list(APPEND INC_SYS
|
|
${TBB_INCLUDE_DIRS}
|
|
)
|
|
|
|
list(APPEND LIB
|
|
${TBB_LIBRARIES}
|
|
)
|
|
endif()
|
|
|
|
if(WITH_OPENVDB)
|
|
list(APPEND INC
|
|
../../../intern/openvdb
|
|
)
|
|
list(APPEND INC_SYS
|
|
${OPENVDB_INCLUDE_DIRS}
|
|
)
|
|
list(APPEND LIB
|
|
bf_intern_openvdb
|
|
${OPENVDB_LIBRARIES}
|
|
)
|
|
add_definitions(-DWITH_OPENVDB ${OPENVDB_DEFINITIONS})
|
|
endif()
|
|
|
|
if(WITH_EXPERIMENTAL_FEATURES)
|
|
add_definitions(-DWITH_SIMULATION_DATABLOCK)
|
|
endif()
|
|
|
|
# So we can have special tricks in modifier system.
|
|
|
|
blender_add_lib(bf_modifiers "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")
|
|
|
|
# RNA_prototypes.h
|
|
add_dependencies(bf_modifiers bf_rna)
|