Page MenuHome
Files F4623

mesh_paint_floater_patch.diff
Public
Actions

mesh_paint_floater_patch.diff
View Options

Index: source/blender/include/butspace.h
===================================================================
RCS file: /cvsroot/bf-blender/blender/source/blender/include/butspace.h,v
retrieving revision 1.106
diff -r1.106 butspace.h
105a106
> extern void mesh_paint_buttons(struct uiBlock *);
Index: source/blender/src/buttons_editing.c
===================================================================
RCS file: /cvsroot/bf-blender/blender/source/blender/src/buttons_editing.c,v
retrieving revision 1.378
diff -r1.378 buttons_editing.c
5074c5074
< static void editing_panel_mesh_paint(void)
---
> void mesh_paint_buttons(uiBlock *block)
5076,5085c5076
< uiBlock *block;
<
< block= uiNewBlock(&curarea->uiblocks, "editing_panel_mesh_paint", UI_EMBOSS, UI_HELV, curarea->win);
< if(uiNewPanel(curarea, block, "Paint", "Editing", 640, 0, 318, 204)==0) return;
<
<
< if(G.f & G_WEIGHTPAINT) {
< weight_paint_buttons(block);
< }
< else if(G.f & G_VERTEXPAINT) {
---
> if(G.f & G_VERTEXPAINT) {
5123,5124c5114
< }
< else { /* texture paint */
---
> } else { /* texture paint */
5179a5170,5184
> }
> }
>
> static void editing_panel_mesh_paint(void)
> {
> uiBlock *block;
>
> block= uiNewBlock(&curarea->uiblocks, "editing_panel_mesh_paint", UI_EMBOSS, UI_HELV, curarea->win);
> if(uiNewPanel(curarea, block, "Paint", "Editing", 640, 0, 318, 204)==0) return;
>
>
> if(G.f & G_WEIGHTPAINT) {
> weight_paint_buttons(block);
> } else {
> mesh_paint_buttons(block);
Index: source/blender/src/drawview.c
===================================================================
RCS file: /cvsroot/bf-blender/blender/source/blender/src/drawview.c,v
retrieving revision 1.282
diff -r1.282 drawview.c
2162d2161
<
2228,2230c2227,2228
< if (rgb)
< /* 'f' is for floating panel */
< uiBlockPickerButtons(block, rgb, hsv, old, hexcol, 'f', REDRAWBUTSEDIT);
---
>
> if (rgb) mesh_paint_buttons(block);
Index: source/blender/src/interface.c
===================================================================
RCS file: /cvsroot/bf-blender/blender/source/blender/src/interface.c,v
retrieving revision 1.267
diff -r1.267 interface.c
3252c3252
< ListBase listb={NULL, NULL};
---
> /* ListBase listb={NULL, NULL}; */
3255c3255
< short event;
---
> /* short event; */
3273c3273
< block= uiNewBlock(&listb, "colorpicker", UI_EMBOSS, UI_HELV, but->win);
---
> block= uiNewBlock(&curarea->uiblocks, "colorpicker", UI_EMBOSS, UI_HELV, but->win);
3289c3289
< event= uiDoBlocks(&listb, 0);
---
> /* event= uiDoBlocks(&listb, 0); */

File Metadata

Mime Type
text/x-diff
Storage Engine
local-disk
Storage Format
Raw Data
Storage Handle
28/dc/a8a2e4795d4a32914a49dce8a874

Event Timeline