[Bf-blender-cvs] [cefbe8f] master: Fix build error with GCC 6.1.
Brecht Van Lommel
noreply at git.blender.org
Sun Jun 12 21:30:13 CEST 2016
Commit: cefbe8fe54016d4a16a9ba06c56d6c3c0c3d6024
Author: Brecht Van Lommel
Date: Sun Jun 12 21:25:14 2016 +0200
Branches: master
https://developer.blender.org/rBcefbe8fe54016d4a16a9ba06c56d6c3c0c3d6024
Fix build error with GCC 6.1.
===================================================================
M intern/cycles/graph/node_type.h
===================================================================
diff --git a/intern/cycles/graph/node_type.h b/intern/cycles/graph/node_type.h
index e84631c..60c3244 100644
--- a/intern/cycles/graph/node_type.h
+++ b/intern/cycles/graph/node_type.h
@@ -155,7 +155,7 @@ const NodeType *structname::register_type()
#define SOCKET_DEFINE(name, ui_name, default_value, datatype, TYPE, flags, ...) \
{ \
static datatype defval = default_value; \
- CHECK_TYPE_PAIR(((T *)1)->name, datatype); \
+ CHECK_TYPE(((T *)1)->name, datatype); \
type->register_input(ustring(#name), ustring(ui_name), TYPE, SOCKET_OFFSETOF(T, name), &defval, NULL, NULL, flags, ##__VA_ARGS__); \
}
More information about the Bf-blender-cvs
mailing list