[Bf-blender-cvs] [1a8bd3c] cycles-ptex-24: Pre-weekly crash fix
Nicholas Bishop
noreply at git.blender.org
Fri Jan 30 18:00:58 CET 2015
Commit: 1a8bd3c3dcf2b205cfa6101f64468030c24c9cdb
Author: Nicholas Bishop
Date: Fri Jan 30 17:28:42 2015 +0100
Branches: cycles-ptex-24
https://developer.blender.org/rB1a8bd3c3dcf2b205cfa6101f64468030c24c9cdb
Pre-weekly crash fix
===================================================================
M source/blender/blenkernel/intern/material.c
===================================================================
diff --git a/source/blender/blenkernel/intern/material.c b/source/blender/blenkernel/intern/material.c
index 5886f18..f56bea2 100644
--- a/source/blender/blenkernel/intern/material.c
+++ b/source/blender/blenkernel/intern/material.c
@@ -1420,9 +1420,16 @@ void BKE_texpaint_slot_refresh_cache(Scene *scene, Material *ma)
if (node->typeinfo->nclass == NODE_CLASS_TEXTURE &&
node->typeinfo->type == SH_NODE_TEX_PTEX)
{
+ NodeTexPtex *storage = node->storage;
+
if (active_node == node)
ma->paint_active_slot = index;
- //ma->texpaintslot[index++].ima =;
+
+ // TODO
+ ma->texpaintslot[index].index = 0;
+ ma->texpaintslot[index].uvname = storage->layer_name;
+ ma->texpaintslot[index].ima = NULL;
+
index++;
}
}
More information about the Bf-blender-cvs
mailing list