Cleanup: Run `make format`
This commit is contained in:
parent
5ecaa9a838
commit
1c4a1c13e0
|
@ -50,8 +50,8 @@
|
|||
#include <cmath>
|
||||
#include <cstdint>
|
||||
|
||||
#include "BLI_math_vec_types.hh"
|
||||
#include "BLI_math_base_safe.h"
|
||||
#include "BLI_math_vec_types.hh"
|
||||
#include "BLI_noise.hh"
|
||||
#include "BLI_utildefines.h"
|
||||
|
||||
|
|
|
@ -28,13 +28,13 @@ SceneTimeNode::SceneTimeNode(bNode *editor_node) : Node(editor_node)
|
|||
}
|
||||
|
||||
void SceneTimeNode::convert_to_operations(NodeConverter &converter,
|
||||
const CompositorContext &context) const
|
||||
const CompositorContext &context) const
|
||||
{
|
||||
SetValueOperation *SecondOperation = new SetValueOperation();
|
||||
SetValueOperation *frameOperation = new SetValueOperation();
|
||||
|
||||
const int frameNumber = context.get_framenumber();
|
||||
const Scene* scene = context.get_scene();
|
||||
const Scene *scene = context.get_scene();
|
||||
const double frameRate = (((double)scene->r.frs_sec) / (double)scene->r.frs_sec_base);
|
||||
|
||||
SecondOperation->set_value(float(frameNumber / frameRate));
|
||||
|
|
|
@ -2091,7 +2091,7 @@ static bool area_split_allowed(const ScrArea *area, const eScreenAxis dir_axis)
|
|||
}
|
||||
|
||||
if ((dir_axis == SCREEN_AXIS_V && area->winx <= 2 * AREAMINX) ||
|
||||
(dir_axis == SCREEN_AXIS_H && area->winy <= 2 * ED_area_headersize())) {
|
||||
(dir_axis == SCREEN_AXIS_H && area->winy <= 2 * ED_area_headersize())) {
|
||||
/* Must be at least double minimum sizes to split into two. */
|
||||
return false;
|
||||
}
|
||||
|
|
|
@ -125,7 +125,8 @@ TreeTraversalAction outliner_find_selected_objects(TreeElement *te, void *custom
|
|||
return TRAVERSE_CONTINUE;
|
||||
}
|
||||
|
||||
if ((tselem->type != TSE_SOME_ID) || (tselem->id == nullptr) || (GS(tselem->id->name) != ID_OB)) {
|
||||
if ((tselem->type != TSE_SOME_ID) || (tselem->id == nullptr) ||
|
||||
(GS(tselem->id->name) != ID_OB)) {
|
||||
return TRAVERSE_SKIP_CHILDS;
|
||||
}
|
||||
|
||||
|
|
|
@ -1540,8 +1540,12 @@ void outliner_dropboxes(void)
|
|||
WM_dropbox_add(lb, "OUTLINER_OT_parent_clear", parent_clear_poll, nullptr, nullptr, nullptr);
|
||||
WM_dropbox_add(lb, "OUTLINER_OT_scene_drop", scene_drop_poll, nullptr, nullptr, nullptr);
|
||||
WM_dropbox_add(lb, "OUTLINER_OT_material_drop", material_drop_poll, nullptr, nullptr, nullptr);
|
||||
WM_dropbox_add(
|
||||
lb, "OUTLINER_OT_datastack_drop", datastack_drop_poll, nullptr, nullptr, datastack_drop_tooltip);
|
||||
WM_dropbox_add(lb,
|
||||
"OUTLINER_OT_datastack_drop",
|
||||
datastack_drop_poll,
|
||||
nullptr,
|
||||
nullptr,
|
||||
datastack_drop_tooltip);
|
||||
WM_dropbox_add(lb,
|
||||
"OUTLINER_OT_collection_drop",
|
||||
collection_drop_poll,
|
||||
|
|
|
@ -527,8 +527,13 @@ void outliner_collection_isolate_flag(Scene *scene,
|
|||
is_hide);
|
||||
|
||||
/* Make this collection and its children collections the only "visible". */
|
||||
outliner_collection_set_flag_recursive(
|
||||
scene, view_layer, layer_collection, collection, layer_or_collection_prop, nullptr, !is_hide);
|
||||
outliner_collection_set_flag_recursive(scene,
|
||||
view_layer,
|
||||
layer_collection,
|
||||
collection,
|
||||
layer_or_collection_prop,
|
||||
nullptr,
|
||||
!is_hide);
|
||||
|
||||
/* Make this collection direct parents also "visible". */
|
||||
if (layer_collection) {
|
||||
|
|
Loading…
Reference in New Issue