diff --git a/build_files/build_environment/cmake/opensubdiv.cmake b/build_files/build_environment/cmake/opensubdiv.cmake index 498e32ba5ac..c3e6613abff 100644 --- a/build_files/build_environment/cmake/opensubdiv.cmake +++ b/build_files/build_environment/cmake/opensubdiv.cmake @@ -58,7 +58,7 @@ if(WIN32) COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/opensubdiv/lib/osdCPU.lib ${HARVEST_TARGET}/opensubdiv/lib/osdCPU_d.lib - COMMAND ${CMAKE_COMMAND} -E copy + COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/opensubdiv/lib/osdGPU.lib ${HARVEST_TARGET}/opensubdiv/lib/osdGPU_d.lib diff --git a/source/blender/editors/interface/interface_layout.cc b/source/blender/editors/interface/interface_layout.cc index e6b3823fbc8..424cc6f8c4e 100644 --- a/source/blender/editors/interface/interface_layout.cc +++ b/source/blender/editors/interface/interface_layout.cc @@ -3151,7 +3151,8 @@ void uiItemDecoratorR_prop(uiLayout *layout, PointerRNA *ptr, PropertyRNA *prop, UI_but_func_set(but, ui_but_anim_decorate_cb, but, nullptr); but->flag |= UI_BUT_UNDO | UI_BUT_DRAG_LOCK; - /* Decorators have their own RNA data, using the normal #uiBut RNA members has many side-effects. */ + /* Decorators have their own RNA data, using the normal #uiBut RNA members has many + * side-effects. */ but->decorated_rnapoin = *ptr; but->decorated_rnaprop = prop; /* ui_def_but_rna() sets non-array buttons to have a RNA index of 0. */ diff --git a/source/blender/editors/space_sequencer/sequencer_channels_draw.cc b/source/blender/editors/space_sequencer/sequencer_channels_draw.cc index b956c6b036c..9f1def17c3a 100644 --- a/source/blender/editors/space_sequencer/sequencer_channels_draw.cc +++ b/source/blender/editors/space_sequencer/sequencer_channels_draw.cc @@ -190,7 +190,8 @@ static rctf label_rect_init(const SeqChannelDrawContext *context, float margin_x = icon_width_get(context) * 0.65; float width = max_ff(0.0f, context->v2d->cur.xmax / context->scale - used_width); - /* Text input has its own margin. Prevent text jumping around and use as much space as possible. */ + /* Text input has its own margin. Prevent text jumping around and use as much space as possible. + */ if (channel_is_being_renamed(CTX_wm_space_seq(context->C), channel_index)) { float input_box_margin = icon_width_get(context) * 0.5f; margin_x -= input_box_margin; diff --git a/source/blender/modifiers/CMakeLists.txt b/source/blender/modifiers/CMakeLists.txt index 5f191b0ca37..e0ac4cfaafd 100644 --- a/source/blender/modifiers/CMakeLists.txt +++ b/source/blender/modifiers/CMakeLists.txt @@ -17,7 +17,7 @@ set(INC ../render ../windowmanager ../../../intern/eigen - + # Needed for shared line art functions from legacy implementations. ../gpencil_modifiers_legacy ../gpencil_modifiers_legacy/intern