Commit: 20a89f9386c39fcebd42bc99069dd4e1f97607fa
Author: Antony Riakiotakis
Date: Mon Jun 9 16:47:25 2014 +0300
https://developer.blender.org/rB20a89f9386c39fcebd42bc99069dd4e1f97607fa
Merge branch 'master' into soc-2013-paint
Conflicts:
release/scripts/startup/bl_ui/space_view3d_toolbar.py
source/blender/editors/uvedit/uvedit_draw.c
===================================================================
===================================================================
diff --cc release/scripts/startup/bl_ui/space_view3d_toolbar.py
index fe91080,c20c36b..8a4a8ff
--- a/release/scripts/startup/bl_ui/space_view3d_toolbar.py
+++ b/release/scripts/startup/bl_ui/space_view3d_toolbar.py
@@@ -1678,25 -1558,11 +1701,12 @@@ class VIEW3D_PT_tools_projectpaint(View
col = layout.column()
col.active = (settings.brush.image_tool == 'CLONE')
- col.prop(ipaint, "use_clone_layer", text="Clone from UV map")
- clone_text = mesh.uv_texture_clone.name if mesh.uv_texture_clone else
""
- col.menu("VIEW3D_MT_tools_projectpaint_clone", text=clone_text,
translate=False)
+ col.prop(ipaint, "use_clone_layer", text="Clone from paint slot")
+ #clone_text = mesh.uv_texture_clone.name if mesh.uv_texture_clone
else ""
+ #col.menu("VIEW3D_MT_tools_projectpaint_clone", text=clone_text,
translate=False)
layout.prop(ipaint, "seam_bleed")
-
- col = layout.column()
- col.label(text="External Editing:")
-
- row = col.split(align=True, percentage=0.55)
- row.operator("image.project_edit", text="Quick Edit")
- row.operator("image.project_apply", text="Apply")
-
- col.row().prop(ipaint, "screen_grab_size", text="")
-
- col.operator("paint.project_image", text="Apply Camera Image")
- col.operator("image.save_dirty", text="Save All Edited")
-
+ self.unified_paint_settings(col, context)
class VIEW3D_PT_imagepaint_options(View3DPaintPanel):
diff --cc source/blender/editors/uvedit/uvedit_draw.c
index e21e0a6,7c2f71c..808cb5f
--- a/source/blender/editors/uvedit/uvedit_draw.c
+++ b/source/blender/editors/uvedit/uvedit_draw.c
@@@ -46,9 -48,7 +49,9 @@@
#include "BKE_DerivedMesh.h"
#include "BKE_editmesh.h"
+#include "BKE_material.h"
+
- #include "BLI_buffer.h"
+ #include "BKE_scene.h"
#include "BIF_gl.h"
#include "BIF_glutil.h"
@@@ -396,39 -469,15 +472,41 @@@ static void draw_uvs_other(Scene *scene
static void draw_uvs_texpaint(SpaceImage *sima, Scene *scene, Object *ob)
{
- Mesh *me = ob->data;
+ const bool new_shading_nodes = BKE_scene_use_new_shading_nodes(scene);
Image *curimage = ED_space_image(sima);
++ Mesh *me = ob->data;
+ Material *ma;
- if (sima->flag & SI_DRAW_OTHER)
- draw_uvs_other(scene, ob, curimage);
+ if (sima->flag & SI_DRAW_OTHER) {
+ draw_uvs_other(scene, ob, curimage, new_shading_nodes);
+ }
UI_ThemeColor(TH_UV_SHADOW);
- draw_uvs_other_mesh(ob, curimage, new_shading_nodes);
+
+ ma = give_current_material(ob, ob->actcol);
+
+ if (me->mtpoly) {
+ MPoly *mpoly = me->mpoly;
+ MLoopUV *mloopuv, *mloopuv_base;
+ int a, b;
+ if (!(ma && ma->texpaintslot &&
ma->texpaintslot[ma->paint_active_slot].uvname[0] &&
+ (mloopuv = CustomData_get_layer_named(&me->ldata,
CD_MLOOPUV, ma->texpaintslot[ma->paint_active_slot].uvname))))
+ {
+ mloopuv = me->mloopuv;
+ }
+
+ mloopuv_base = mloopuv;
+
+ for (a = me->totpoly; a > 0; a--, mpoly++) {
+ glBegin(GL_LINE_LOOP);
+
+ mloopuv = mloopuv_base + mpoly->loopstart;
+ for (b = 0; b < mpoly->totloop; b++, mloopuv++) {
+ glVertex2fv(mloopuv->uv);
+ }
+ glEnd();
+ }
+ }
}
#ifdef USE_EDBM_LOOPTRIS
diff --cc source/blender/windowmanager/intern/wm_event_system.c
index f34263d,175a8d2..20d2185
--- a/source/blender/windowmanager/intern/wm_event_system.c
+++ b/source/blender/windowmanager/intern/wm_event_system.c
@@@ -2149,15 -2140,10 +2149,15 @@@ static void wm_event_drag_test(wmWindow
return;
}
- if (event->type == MOUSEMOVE)
+ if (event->type == MOUSEMOVE || ISKEYMODIFIER(event->type))
win->screen->do_draw_drag = true;
else if (event->type == ESCKEY) {
- BLI_freelistN(&wm->drags);
+ wmDrag *drag;
+ while ((drag = wm->drags.first)) {
+ BLI_remlink(&wm->drags, drag);
+ WM_drag_free(drag);
+ }
+
win->screen->do_draw_drag = true;
}
else if (event->type == LEFTMOUSE && event->val == KM_RELEASE) {
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
