Revision: 41731
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=41731
Author: blendix
Date: 2011-11-10 12:53:40 +0000 (Thu, 10 Nov 2011)
Log Message:
-----------
Cycles: many of the new nodes were not showing properties/buttons in nodes in
the node editor.
Modified Paths:
--------------
trunk/blender/source/blender/nodes/shader/nodes/node_shader_bsdf_glass.c
trunk/blender/source/blender/nodes/shader/nodes/node_shader_bsdf_glossy.c
trunk/blender/source/blender/nodes/shader/nodes/node_shader_geom.c
trunk/blender/source/blender/nodes/shader/nodes/node_shader_tex_environment.c
trunk/blender/source/blender/nodes/shader/nodes/node_shader_tex_gradient.c
trunk/blender/source/blender/nodes/shader/nodes/node_shader_tex_image.c
trunk/blender/source/blender/nodes/shader/nodes/node_shader_tex_magic.c
trunk/blender/source/blender/nodes/shader/nodes/node_shader_tex_musgrave.c
trunk/blender/source/blender/nodes/shader/nodes/node_shader_tex_sky.c
trunk/blender/source/blender/nodes/shader/nodes/node_shader_tex_voronoi.c
trunk/blender/source/blender/nodes/shader/nodes/node_shader_tex_wave.c
Modified:
trunk/blender/source/blender/nodes/shader/nodes/node_shader_bsdf_glass.c
===================================================================
--- trunk/blender/source/blender/nodes/shader/nodes/node_shader_bsdf_glass.c
2011-11-10 12:52:17 UTC (rev 41730)
+++ trunk/blender/source/blender/nodes/shader/nodes/node_shader_bsdf_glass.c
2011-11-10 12:53:40 UTC (rev 41731)
@@ -53,7 +53,7 @@
{
static bNodeType ntype;
- node_type_base(&ntype, SH_NODE_BSDF_GLASS, "Glass BSDF",
NODE_CLASS_SHADER, 0);
+ node_type_base(&ntype, SH_NODE_BSDF_GLASS, "Glass BSDF",
NODE_CLASS_SHADER, NODE_OPTIONS);
node_type_compatibility(&ntype, NODE_NEW_SHADING);
node_type_socket_templates(&ntype, sh_node_bsdf_glass_in,
sh_node_bsdf_glass_out);
node_type_size(&ntype, 150, 60, 200);
Modified:
trunk/blender/source/blender/nodes/shader/nodes/node_shader_bsdf_glossy.c
===================================================================
--- trunk/blender/source/blender/nodes/shader/nodes/node_shader_bsdf_glossy.c
2011-11-10 12:52:17 UTC (rev 41730)
+++ trunk/blender/source/blender/nodes/shader/nodes/node_shader_bsdf_glossy.c
2011-11-10 12:53:40 UTC (rev 41731)
@@ -53,7 +53,7 @@
{
static bNodeType ntype;
- node_type_base(&ntype, SH_NODE_BSDF_GLOSSY, "Glossy BSDF",
NODE_CLASS_SHADER, 0);
+ node_type_base(&ntype, SH_NODE_BSDF_GLOSSY, "Glossy BSDF",
NODE_CLASS_SHADER, NODE_OPTIONS);
node_type_compatibility(&ntype, NODE_NEW_SHADING);
node_type_socket_templates(&ntype, sh_node_bsdf_glossy_in,
sh_node_bsdf_glossy_out);
node_type_size(&ntype, 150, 60, 200);
Modified: trunk/blender/source/blender/nodes/shader/nodes/node_shader_geom.c
===================================================================
--- trunk/blender/source/blender/nodes/shader/nodes/node_shader_geom.c
2011-11-10 12:52:17 UTC (rev 41730)
+++ trunk/blender/source/blender/nodes/shader/nodes/node_shader_geom.c
2011-11-10 12:53:40 UTC (rev 41731)
@@ -144,7 +144,6 @@
node_type_base(&ntype, SH_NODE_GEOMETRY, "Geometry", NODE_CLASS_INPUT,
NODE_OPTIONS);
node_type_compatibility(&ntype, NODE_OLD_SHADING);
- 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);
Modified:
trunk/blender/source/blender/nodes/shader/nodes/node_shader_tex_environment.c
===================================================================
---
trunk/blender/source/blender/nodes/shader/nodes/node_shader_tex_environment.c
2011-11-10 12:52:17 UTC (rev 41730)
+++
trunk/blender/source/blender/nodes/shader/nodes/node_shader_tex_environment.c
2011-11-10 12:53:40 UTC (rev 41731)
@@ -75,7 +75,7 @@
{
static bNodeType ntype;
- node_type_base(&ntype, SH_NODE_TEX_ENVIRONMENT, "Environment Texture",
NODE_CLASS_TEXTURE, 0);
+ node_type_base(&ntype, SH_NODE_TEX_ENVIRONMENT, "Environment Texture",
NODE_CLASS_TEXTURE, NODE_OPTIONS);
node_type_compatibility(&ntype, NODE_NEW_SHADING);
node_type_socket_templates(&ntype, sh_node_tex_environment_in,
sh_node_tex_environment_out);
node_type_size(&ntype, 150, 60, 200);
Modified:
trunk/blender/source/blender/nodes/shader/nodes/node_shader_tex_gradient.c
===================================================================
--- trunk/blender/source/blender/nodes/shader/nodes/node_shader_tex_gradient.c
2011-11-10 12:52:17 UTC (rev 41730)
+++ trunk/blender/source/blender/nodes/shader/nodes/node_shader_tex_gradient.c
2011-11-10 12:53:40 UTC (rev 41731)
@@ -67,7 +67,7 @@
{
static bNodeType ntype;
- node_type_base(&ntype, SH_NODE_TEX_GRADIENT, "Gradient Texture",
NODE_CLASS_TEXTURE, 0);
+ node_type_base(&ntype, SH_NODE_TEX_GRADIENT, "Gradient Texture",
NODE_CLASS_TEXTURE, NODE_OPTIONS);
node_type_compatibility(&ntype, NODE_NEW_SHADING);
node_type_socket_templates(&ntype, sh_node_tex_gradient_in,
sh_node_tex_gradient_out);
node_type_size(&ntype, 150, 60, 200);
Modified:
trunk/blender/source/blender/nodes/shader/nodes/node_shader_tex_image.c
===================================================================
--- trunk/blender/source/blender/nodes/shader/nodes/node_shader_tex_image.c
2011-11-10 12:52:17 UTC (rev 41730)
+++ trunk/blender/source/blender/nodes/shader/nodes/node_shader_tex_image.c
2011-11-10 12:53:40 UTC (rev 41731)
@@ -75,7 +75,7 @@
{
static bNodeType ntype;
- node_type_base(&ntype, SH_NODE_TEX_IMAGE, "Image Texture",
NODE_CLASS_TEXTURE, 0);
+ node_type_base(&ntype, SH_NODE_TEX_IMAGE, "Image Texture",
NODE_CLASS_TEXTURE, NODE_OPTIONS);
node_type_compatibility(&ntype, NODE_NEW_SHADING);
node_type_socket_templates(&ntype, sh_node_tex_image_in,
sh_node_tex_image_out);
node_type_size(&ntype, 150, 60, 200);
Modified:
trunk/blender/source/blender/nodes/shader/nodes/node_shader_tex_magic.c
===================================================================
--- trunk/blender/source/blender/nodes/shader/nodes/node_shader_tex_magic.c
2011-11-10 12:52:17 UTC (rev 41730)
+++ trunk/blender/source/blender/nodes/shader/nodes/node_shader_tex_magic.c
2011-11-10 12:53:40 UTC (rev 41731)
@@ -72,7 +72,7 @@
{
static bNodeType ntype;
- node_type_base(&ntype, SH_NODE_TEX_MAGIC, "Magic Texture",
NODE_CLASS_TEXTURE, 0);
+ node_type_base(&ntype, SH_NODE_TEX_MAGIC, "Magic Texture",
NODE_CLASS_TEXTURE, NODE_OPTIONS);
node_type_compatibility(&ntype, NODE_NEW_SHADING);
node_type_socket_templates(&ntype, sh_node_tex_magic_in,
sh_node_tex_magic_out);
node_type_size(&ntype, 150, 60, 200);
Modified:
trunk/blender/source/blender/nodes/shader/nodes/node_shader_tex_musgrave.c
===================================================================
--- trunk/blender/source/blender/nodes/shader/nodes/node_shader_tex_musgrave.c
2011-11-10 12:52:17 UTC (rev 41730)
+++ trunk/blender/source/blender/nodes/shader/nodes/node_shader_tex_musgrave.c
2011-11-10 12:53:40 UTC (rev 41731)
@@ -73,7 +73,7 @@
{
static bNodeType ntype;
- node_type_base(&ntype, SH_NODE_TEX_MUSGRAVE, "Musgrave Texture",
NODE_CLASS_TEXTURE, 0);
+ node_type_base(&ntype, SH_NODE_TEX_MUSGRAVE, "Musgrave Texture",
NODE_CLASS_TEXTURE, NODE_OPTIONS);
node_type_compatibility(&ntype, NODE_NEW_SHADING);
node_type_socket_templates(&ntype, sh_node_tex_musgrave_in,
sh_node_tex_musgrave_out);
node_type_size(&ntype, 150, 60, 200);
Modified: trunk/blender/source/blender/nodes/shader/nodes/node_shader_tex_sky.c
===================================================================
--- trunk/blender/source/blender/nodes/shader/nodes/node_shader_tex_sky.c
2011-11-10 12:52:17 UTC (rev 41730)
+++ trunk/blender/source/blender/nodes/shader/nodes/node_shader_tex_sky.c
2011-11-10 12:53:40 UTC (rev 41731)
@@ -69,7 +69,7 @@
{
static bNodeType ntype;
- node_type_base(&ntype, SH_NODE_TEX_SKY, "Sky Texture",
NODE_CLASS_TEXTURE, 0);
+ node_type_base(&ntype, SH_NODE_TEX_SKY, "Sky Texture",
NODE_CLASS_TEXTURE, NODE_OPTIONS);
node_type_compatibility(&ntype, NODE_NEW_SHADING);
node_type_socket_templates(&ntype, sh_node_tex_sky_in,
sh_node_tex_sky_out);
node_type_size(&ntype, 150, 60, 200);
Modified:
trunk/blender/source/blender/nodes/shader/nodes/node_shader_tex_voronoi.c
===================================================================
--- trunk/blender/source/blender/nodes/shader/nodes/node_shader_tex_voronoi.c
2011-11-10 12:52:17 UTC (rev 41730)
+++ trunk/blender/source/blender/nodes/shader/nodes/node_shader_tex_voronoi.c
2011-11-10 12:53:40 UTC (rev 41731)
@@ -68,7 +68,7 @@
{
static bNodeType ntype;
- node_type_base(&ntype, SH_NODE_TEX_VORONOI, "Voronoi Texture",
NODE_CLASS_TEXTURE, 0);
+ node_type_base(&ntype, SH_NODE_TEX_VORONOI, "Voronoi Texture",
NODE_CLASS_TEXTURE, NODE_OPTIONS);
node_type_compatibility(&ntype, NODE_NEW_SHADING);
node_type_socket_templates(&ntype, sh_node_tex_voronoi_in,
sh_node_tex_voronoi_out);
node_type_size(&ntype, 150, 60, 200);
Modified: trunk/blender/source/blender/nodes/shader/nodes/node_shader_tex_wave.c
===================================================================
--- trunk/blender/source/blender/nodes/shader/nodes/node_shader_tex_wave.c
2011-11-10 12:52:17 UTC (rev 41730)
+++ trunk/blender/source/blender/nodes/shader/nodes/node_shader_tex_wave.c
2011-11-10 12:53:40 UTC (rev 41731)
@@ -71,7 +71,7 @@
{
static bNodeType ntype;
- node_type_base(&ntype, SH_NODE_TEX_WAVE, "Wave Texture",
NODE_CLASS_TEXTURE, 0);
+ node_type_base(&ntype, SH_NODE_TEX_WAVE, "Wave Texture",
NODE_CLASS_TEXTURE, NODE_OPTIONS);
node_type_compatibility(&ntype, NODE_NEW_SHADING);
node_type_socket_templates(&ntype, sh_node_tex_wave_in,
sh_node_tex_wave_out);
node_type_size(&ntype, 150, 60, 200);
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
