Merging r39693 through r39989 from vgroup_modifiers branch into trunk.
authorBastien Montagne <montagne29@wanadoo.fr>
Wed, 7 Sep 2011 06:33:29 +0000 (06:33 +0000)
committerBastien Montagne <montagne29@wanadoo.fr>
Wed, 7 Sep 2011 06:33:29 +0000 (06:33 +0000)
source/blender/editors/include/UI_icons.h
source/blender/editors/space_outliner/outliner_draw.c
source/blender/nodes/composite/nodes/node_composite_value.c
source/blender/nodes/shader/nodes/node_shader_value.c

index 0c553a1838183a35e1979270f1ceb96fa91d6971..d6ef4264b0725814a9e11e257617976dd7071c26 100644 (file)
@@ -591,7 +591,6 @@ DEF_ICON(MOD_SOLIDIFY)
 DEF_ICON(MOD_SCREW)
 DEF_ICON(MOD_WEIGHTVG)
 #ifndef DEF_ICON_BLANK_SKIP
-/*     DEF_ICON(BLANK160)*/
        DEF_ICON(BLANK161)
        DEF_ICON(BLANK162)
        DEF_ICON(BLANK163)
index 6548beefd2e5f92116b1fb299cc143939bf9824d..95a315272b97b0155624a17e18639505418e90db 100644 (file)
@@ -1008,10 +1008,6 @@ static void tselem_draw_icon(uiBlock *block, int xmax, float x, float y, TreeSto
                                                UI_icon_draw(x, y, ICON_MOD_SOLIDIFY); break;
                                        case eModifierType_Screw:
                                                UI_icon_draw(x, y, ICON_MOD_SCREW); break;
-                                       case eModifierType_WeightVGEdit:
-                                       case eModifierType_WeightVGMix:
-                                       case eModifierType_WeightVGProximity:
-                                               UI_icon_draw(x, y, ICON_MOD_WEIGHTVG); break;
                                        default:
                                                UI_icon_draw(x, y, ICON_DOT); break;
                                }
index 0bb558cfa9d60e9e4fa9b08f7f7ea485e405be8d..80b71b9e65dfa6f518c8de313d358be8b188de1a 100644 (file)
@@ -46,6 +46,8 @@ static void node_composit_init_value(bNodeTree *UNUSED(ntree), bNode *node, bNod
        bNodeSocketValueFloat *dval= (bNodeSocketValueFloat*)sock->default_value;
        /* uses the default value of the output socket, must be initialized here */
        dval->value = 0.5f;
+       dval->min = -FLT_MAX;
+       dval->max = FLT_MAX;
 }
 
 static void node_composit_exec_value(void *UNUSED(data), bNode *node, bNodeStack **UNUSED(in), bNodeStack **out)
index bbd3f8fc242643d1f0d508780d2a2b30bda55840..aadbd034e10fd5f9b2fff2c476bb748931d38470 100644 (file)
@@ -46,6 +46,8 @@ static void node_shader_init_value(bNodeTree *UNUSED(ntree), bNode *node, bNodeT
        bNodeSocketValueFloat *dval= (bNodeSocketValueFloat*)sock->default_value;
        /* uses the default value of the output socket, must be initialized here */
        dval->value = 0.5f;
+       dval->min = -FLT_MAX;
+       dval->max = FLT_MAX;
 }
 
 static void node_shader_exec_value(void *UNUSED(data), bNode *node, bNodeStack **UNUSED(in), bNodeStack **out)