merging trunk 17221:17300
[blender-staging.git] / source / blender / src / buttons_editing.c
index 26c0496f1070aba73da8919f9aea928d7c4536ed..46b833fb6493be5ffb40a47c02ceff8dc26e54ab 100644 (file)
@@ -5852,8 +5852,10 @@ void sculptmode_draw_interface_textures(uiBlock *block, unsigned short cx, unsig
                uiBlockBeginAlign(block);
                uiDefBut(block,LABEL,B_NOP,"",cx,cy,115,20,0,0,0,0,0,""); /* Padding */
        } else {
+               ID *id = NULL;
+
                mtex= sd->mtex[sd->texact];
-               ID *id= NULL;
+
                uiBlockBeginAlign(block);
                
                if(mtex && mtex->tex) id= &mtex->tex->id;