Merged changes in the trunk up to revision 42116.
[blender.git] / source / blender / nodes / texture / nodes / node_texture_proc.c
index 3012d313db5b0f1e28dbeb319375c41f0d9b222b..efc8228c01c1f819f159f267e64d1ab9d302aa95 100644 (file)
@@ -79,7 +79,7 @@ static void do_proc(float *result, TexParams *p, float *col1, float *col2, char
        }
        else {
                copy_v4_v4(result, col1);
-               ramp_blend(MA_RAMP_BLEND, result, result+1, result+2, texres.tin, col2);
+               ramp_blend(MA_RAMP_BLEND, result, texres.tin, col2);
        }
 }
 
@@ -296,18 +296,18 @@ static void init(bNodeTree *UNUSED(ntree), bNode* node, bNodeTemplate *UNUSED(nt
 
 /* Node type definitions */
 #define TexDef(TEXTYPE, outputs, name, Name) \
-void register_node_type_tex_proc_##name(ListBase *lb) \
+void register_node_type_tex_proc_##name(bNodeTreeType *ttype) \
 { \
        static bNodeType ntype; \
        \
-       node_type_base(&ntype, TEX_NODE_PROC+TEXTYPE, Name, NODE_CLASS_TEXTURE, NODE_PREVIEW|NODE_OPTIONS); \
+       node_type_base(ttype, &ntype, TEX_NODE_PROC+TEXTYPE, Name, NODE_CLASS_TEXTURE, NODE_PREVIEW|NODE_OPTIONS); \
        node_type_socket_templates(&ntype, name##_inputs, outputs); \
        node_type_size(&ntype, 140, 80, 140); \
        node_type_init(&ntype, init); \
        node_type_storage(&ntype, "Tex", node_free_standard_storage, node_copy_standard_storage); \
        node_type_exec(&ntype, name##_exec); \
        \
-       nodeRegisterType(lb, &ntype); \
+       nodeRegisterType(ttype, &ntype); \
 }
        
 #define C outputs_color_only