diff options
| -rw-r--r-- | intern/cycles/kernel/shaders/node_anisotropic_bsdf.osl | 2 | ||||
| -rw-r--r-- | intern/cycles/kernel/shaders/stdcycles.h | 1 | ||||
| -rw-r--r-- | source/blender/editors/space_node/node_draw.c | 2 |
3 files changed, 1 insertions, 4 deletions
diff --git a/intern/cycles/kernel/shaders/node_anisotropic_bsdf.osl b/intern/cycles/kernel/shaders/node_anisotropic_bsdf.osl index 5da511b9619..739cd375ab2 100644 --- a/intern/cycles/kernel/shaders/node_anisotropic_bsdf.osl +++ b/intern/cycles/kernel/shaders/node_anisotropic_bsdf.osl @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - #include "stdcycles.h" +#include "stdcycles.h" shader node_anisotropic_bsdf(color Color = 0.0, string distribution = "GGX", diff --git a/intern/cycles/kernel/shaders/stdcycles.h b/intern/cycles/kernel/shaders/stdcycles.h index 8c27f31a357..dd604da68ce 100644 --- a/intern/cycles/kernel/shaders/stdcycles.h +++ b/intern/cycles/kernel/shaders/stdcycles.h @@ -147,5 +147,4 @@ normal ensure_valid_reflection(normal Ng, vector I, normal N) return N_new_x * X + N_new_z * Ng; } - #endif /* CCL_STDOSL_H */ diff --git a/source/blender/editors/space_node/node_draw.c b/source/blender/editors/space_node/node_draw.c index 755e2cc1618..4627f233720 100644 --- a/source/blender/editors/space_node/node_draw.c +++ b/source/blender/editors/space_node/node_draw.c @@ -354,8 +354,6 @@ void node_from_view(struct bNode *node, float x, float y, float *rx, float *ry) nodeFromView(node, x, y, rx, ry); } - - /* based on settings in node, sets drawing rect info. each redraw! */ static void node_update_basis(const bContext *C, bNodeTree *ntree, bNode *node) { |