Revision: 24475
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=24475
Author: broken
Date: 2009-11-11 07:01:42 +0100 (Wed, 11 Nov 2009)
Log Message:
-----------
node warning fixes
Modified Paths:
--------------
trunk/blender/source/blender/editors/space_node/drawnode.c
trunk/blender/source/blender/editors/space_node/node_draw.c
Modified: trunk/blender/source/blender/editors/space_node/drawnode.c
===================================================================
--- trunk/blender/source/blender/editors/space_node/drawnode.c 2009-11-11
05:03:49 UTC (rev 24474)
+++ trunk/blender/source/blender/editors/space_node/drawnode.c 2009-11-11
06:01:42 UTC (rev 24475)
@@ -94,48 +94,6 @@
#include "node_intern.h"
-
-/* autocomplete callback for buttons */
-static void autocomplete_vcol(bContext *C, char *str, void *arg_v)
-{
- Mesh *me;
- CustomDataLayer *layer;
- AutoComplete *autocpl;
- int a;
-
- if(str[0]==0)
- return;
-
- autocpl= autocomplete_begin(str, 32);
-
- /* search if str matches the beginning of name */
- for(me= G.main->mesh.first; me; me=me->id.next)
- for(a=0, layer= me->fdata.layers; a<me->fdata.totlayer; a++,
layer++)
- if(layer->type == CD_MCOL)
- autocomplete_do_name(autocpl, layer->name);
-
- autocomplete_end(autocpl, str);
-}
-
-static int verify_valid_vcol_name(char *str)
-{
- Mesh *me;
- CustomDataLayer *layer;
- int a;
-
- if(str[0]==0)
- return 1;
-
- /* search if str matches the name */
- for(me= G.main->mesh.first; me; me=me->id.next)
- for(a=0, layer= me->fdata.layers; a<me->fdata.totlayer; a++,
layer++)
- if(layer->type == CD_MCOL)
- if(strcmp(layer->name, str)==0)
- return 1;
-
- return 0;
-}
-
/* ****************** GENERAL CALLBACKS FOR NODES ***************** */
static void node_ID_title_cb(bContext *C, void *node_v, void *unused_v)
@@ -197,7 +155,6 @@
static void node_buts_value(uiLayout *layout, bContext *C, PointerRNA *ptr)
{
- bNode *node= ptr->data;
PointerRNA sockptr;
PropertyRNA *prop;
@@ -211,7 +168,6 @@
static void node_buts_rgb(uiLayout *layout, bContext *C, PointerRNA *ptr)
{
uiLayout *col;
- bNode *node= ptr->data;
PointerRNA sockptr;
PropertyRNA *prop;
@@ -413,11 +369,6 @@
node->menunr= 0;
}
-static void node_texmap_cb(bContext *C, void *texmap_v, void *unused_v)
-{
- init_mapping(texmap_v);
-}
-
static void node_shader_buts_material(uiLayout *layout, bContext *C,
PointerRNA *ptr)
{
bNode *node= ptr->data;
Modified: trunk/blender/source/blender/editors/space_node/node_draw.c
===================================================================
--- trunk/blender/source/blender/editors/space_node/node_draw.c 2009-11-11
05:03:49 UTC (rev 24474)
+++ trunk/blender/source/blender/editors/space_node/node_draw.c 2009-11-11
06:01:42 UTC (rev 24475)
@@ -567,6 +567,8 @@
layout= uiLayoutColumn(uiBlockLayout(block, UI_LAYOUT_VERTICAL,
UI_LAYOUT_PANEL, sock->locx, sock->locy-8, 140, 20, U.uistyles.first), 0);
uiItemR(layout, "", 0, &ptr, "default_value", UI_ITEM_R_EXPAND);
+
+ return block;
}
/* not a callback */
@@ -764,8 +766,7 @@
RNA_pointer_create(&ntree->id, &RNA_NodeSocket, sock,
&ptr);
if(node->block && sock->link==NULL) {
- float *butpoin= sock->ns.vec;
-
+
if(sock->type==SOCK_VALUE) {
bt=uiDefButR(node->block, NUM,
B_NODE_EXEC, sock->name,
(short)sock->locx+NODE_DYS, (short)(sock->locy)-9, (short)node->width-NODE_DY,
17,
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
