Revert "BLI: Refactor vector types & functions to use templates"
Includes unwanted changes
This reverts commit 46e049d0ce.
This commit is contained in:
@@ -2452,7 +2452,7 @@ static void frame_node_draw_label(const bNodeTree &ntree,
|
||||
const bool has_label = node.label[0] != '\0';
|
||||
if (has_label) {
|
||||
BLF_position(fontid, x, y, 0);
|
||||
BLF_draw(fontid, label, BLF_DRAW_STR_DUMMY_MAX);
|
||||
BLF_draw(fontid, label, sizeof(label));
|
||||
}
|
||||
|
||||
/* draw text body */
|
||||
|
||||
@@ -28,9 +28,9 @@
|
||||
#include "DNA_anim_types.h"
|
||||
#include "DNA_node_types.h"
|
||||
|
||||
#include "BLI_float2.hh"
|
||||
#include "BLI_linklist.h"
|
||||
#include "BLI_listbase.h"
|
||||
#include "BLI_math_vec_types.hh"
|
||||
#include "BLI_string.h"
|
||||
#include "BLI_vector.hh"
|
||||
|
||||
|
||||
@@ -23,7 +23,7 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include "BLI_math_vec_types.hh"
|
||||
#include "BLI_float2.hh"
|
||||
#include "BLI_vector.hh"
|
||||
|
||||
#include "BKE_node.h"
|
||||
@@ -43,6 +43,9 @@ struct bNodeLink;
|
||||
struct bNodeSocket;
|
||||
struct wmGizmoGroupType;
|
||||
struct wmKeyConfig;
|
||||
namespace blender {
|
||||
struct float2;
|
||||
}
|
||||
struct wmWindow;
|
||||
|
||||
/** Temporary data used in node link drag modal operator. */
|
||||
|
||||
@@ -111,13 +111,11 @@ static bNode *node_under_mouse_select(bNodeTree &ntree, int mx, int my)
|
||||
|
||||
static bNode *node_under_mouse_tweak(bNodeTree &ntree, const float2 &mouse)
|
||||
{
|
||||
using namespace blender::math;
|
||||
|
||||
LISTBASE_FOREACH_BACKWARD (bNode *, node, &ntree.nodes) {
|
||||
if (node->type == NODE_REROUTE) {
|
||||
bNodeSocket *socket = (bNodeSocket *)node->inputs.first;
|
||||
const float2 location{socket->locx, socket->locy};
|
||||
if (distance(mouse, location) < 24.0f) {
|
||||
if (float2::distance(mouse, location) < 24.0f) {
|
||||
return node;
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user