Merge with trunk r41625
[blender.git] / source / blender / nodes / shader / nodes / node_shader_geom.c
index 495de0247a1fa652d1dcfda73227e5606d4fe057..6547194b33ab957c90d12ab43f41bf321ab2680b 100644 (file)
@@ -1,6 +1,4 @@
 /*
- * $Id$
- *
  * ***** BEGIN GPL LICENSE BLOCK *****
  *
  * This program is free software; you can redistribute it and/or
@@ -93,7 +91,7 @@ static void node_shader_exec_geom(void *data, bNode *node, bNodeStack **UNUSED(i
                                }
                        }
 
-                       VECCOPY(out[GEOM_OUT_VCOL]->vec, scol->col);
+                       copy_v3_v3(out[GEOM_OUT_VCOL]->vec, scol->col);
                        out[GEOM_OUT_VCOL]->vec[3]= scol->col[3];
                        out[GEOM_OUT_VCOL_ALPHA]->vec[0]= scol->col[3];
                }
@@ -145,6 +143,7 @@ void register_node_type_sh_geom(ListBase *lb)
        static bNodeType ntype;
 
        node_type_base(&ntype, SH_NODE_GEOMETRY, "Geometry", NODE_CLASS_INPUT, NODE_OPTIONS);
+       node_type_compatibility(&ntype, NODE_OLD_SHADING);
        node_type_socket_templates(&ntype, NULL, sh_node_geom_out);
        node_type_size(&ntype, 120, 80, 160);
        node_type_init(&ntype, node_shader_init_geometry);