diff options
-rw-r--r-- | intern/cycles/graph/node_type.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/intern/cycles/graph/node_type.h b/intern/cycles/graph/node_type.h index 0d182945e16..69891e6a10a 100644 --- a/intern/cycles/graph/node_type.h +++ b/intern/cycles/graph/node_type.h @@ -165,12 +165,12 @@ struct NodeType { /* Sock Definition Macros */ -#define SOCKET_OFFSETOF(T, name) (((char *)&(((T *)1)->name)) - (char *)1) -#define SOCKET_SIZEOF(T, name) (sizeof(((T *)1)->name)) +#define SOCKET_OFFSETOF(T, name) offsetof(T, name) +#define SOCKET_SIZEOF(T, name) (sizeof(T::name)) #define SOCKET_DEFINE(name, ui_name, default_value, datatype, TYPE, flags, ...) \ { \ static datatype defval = default_value; \ - CHECK_TYPE(((T *)1)->name, datatype); \ + CHECK_TYPE(T::name, datatype); \ type->register_input(ustring(#name), \ ustring(ui_name), \ TYPE, \ |