archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Merge branch 'master' into blender2.8

Browse Source
This commit is contained in:
Aaron Carlisle
2017-07-21 18:28:32 -04:00
parent 64fd45b1df a27b6ae4a9
commit 3aeabe3afa
2 changed files with 29 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
release/scripts/startup/bl_ui/space_view3d_toolbar.py
+19 -15
View File
@@ -916,16 +916,18 @@ class VIEW3D_PT_imapaint_tools_missing(Panel, View3DPaintPanel):
col.separator()
col.label("Missing Canvas", icon='INFO')
col.label("Add or assign a canvas image below")
col.label("Canvas Image")
col.template_ID(toolsettings, "canvas")
col.label("Canvas Image:")
# todo this should be combinded into a single row
col.template_ID(toolsettings, "canvas", open="image.open")
col.operator("image.new", text="New").gen_context = 'PAINT_CANVAS'
if toolsettings.missing_stencil:
col.separator()
col.label("Missing Stencil", icon='INFO')
col.label("Add or assign a stencil image below")
col.label("Stencil Image")
col.template_ID(toolsettings, "stencil_image")
col.label("Stencil Image:")
# todo this should be combinded into a single row
col.template_ID(toolsettings, "stencil_image", open="image.open")
col.operator("image.new", text="New").gen_context = 'PAINT_STENCIL'
@@ -1200,20 +1202,20 @@ class VIEW3D_PT_slots_projectpaint(View3DPanel, Panel):
ob = context.active_object
col = layout.column()
col.label("Painting Mode")
col.label("Painting Mode:")
col.prop(settings, "mode", text="")
col.separator()
if settings.mode == 'MATERIAL':
if len(ob.material_slots) > 1:
col.label("Materials")
col.label("Materials:")
col.template_list("MATERIAL_UL_matslots", "layers",
ob, "material_slots",
ob, "active_material_index", rows=2)
mat = ob.active_material
if mat:
col.label("Available Paint Slots")
col.label("Available Paint Slots:")
col.template_list("TEXTURE_UL_texpaintslots", "",
mat, "texture_paint_images",
mat, "paint_active_slot", rows=2)
@@ -1233,16 +1235,17 @@ class VIEW3D_PT_slots_projectpaint(View3DPanel, Panel):
col.separator()
if slot and slot.index != -1:
col.label("UV Map")
col.prop_search(slot, "uv_layer", ob.data, "uv_layers", text="")
col.label("UV Map:")
col.prop_search(slot, "uv_layer", ob.data, "uv_textures", text="")
elif settings.mode == 'IMAGE':
mesh = ob.data
uv_text = mesh.uv_layers.active.name if mesh.uv_layers.active else ""
col.label("Canvas Image")
col.template_ID(settings, "canvas")
col.label("Canvas Image:")
# todo this should be combinded into a single row
col.template_ID(settings, "canvas", open="image.open")
col.operator("image.new", text="New").gen_context = 'PAINT_CANVAS'
col.label("UV Map")
col.label("UV Map:")
col.menu("VIEW3D_MT_tools_projectpaint_uvlayer", text=uv_text, translate=False)
col.separator()
@@ -1279,11 +1282,12 @@ class VIEW3D_PT_stencil_projectpaint(View3DPanel, Panel):
col.label("UV Map")
col.menu("VIEW3D_MT_tools_projectpaint_stencil", text=stencil_text, translate=False)
col.label("Stencil Image")
col.template_ID(ipaint, "stencil_image")
col.label("Stencil Image:")
# todo this should be combinded into a single row
col.template_ID(ipaint, "stencil_image", open="image.open")
col.operator("image.new", text="New").gen_context = 'PAINT_STENCIL'
col.label("Visualization")
col.label("Visualization:")
row = col.row(align=True)
row.prop(ipaint, "stencil_color", text="")
row.prop(ipaint, "invert_stencil", text="", icon='IMAGE_ALPHA')
source/blender/editors/transform/transform_snap_object.c
+10 -12
View File
@@ -369,7 +369,7 @@ static void raycast_all_cb(void *userdata, int index, const BVHTreeRay *ray, BVH
static bool raycastDerivedMesh(
SnapObjectContext *sctx,
const float ray_orig[3], const float ray_start[3], const float ray_dir[3],
const float ray_start[3], const float ray_dir[3],
Object *ob, DerivedMesh *dm, float obmat[4][4], const unsigned int ob_index,
/* read/write args */
float *ray_depth,
@@ -553,7 +553,7 @@ static bool raycastDerivedMesh(
static bool raycastEditMesh(
SnapObjectContext *sctx,
const float ray_orig[3], const float ray_start[3], const float ray_dir[3],
const float ray_start[3], const float ray_dir[3],
Object *ob, BMEditMesh *em, float obmat[4][4], const unsigned int ob_index,
/* read/write args */
float *ray_depth,
@@ -714,7 +714,7 @@ static bool raycastEditMesh(
*/
static bool raycastObj(
const bContext *C, SnapObjectContext *sctx,
const float ray_orig[3], const float ray_start[3], const float ray_dir[3],
const float ray_start[3], const float ray_dir[3],
Object *ob, float obmat[4][4], const unsigned int ob_index,
bool use_obedit,
/* read/write args */
@@ -736,7 +736,7 @@ static bool raycastObj(
em = BKE_editmesh_from_object(ob);
retval = raycastEditMesh(
sctx,
ray_orig, ray_start, ray_dir,
ray_start, ray_dir,
ob, em, obmat, ob_index,
ray_depth, r_loc, r_no, r_index, r_hit_list);
}
@@ -753,7 +753,7 @@ static bool raycastObj(
}
retval = raycastDerivedMesh(
sctx,
ray_orig, ray_start, ray_dir,
ray_start, ray_dir,
ob, dm, obmat, ob_index,
ray_depth, r_loc, r_no, r_index, r_hit_list);
@@ -773,7 +773,6 @@ static bool raycastObj(
struct RaycastObjUserData {
const float *ray_orig;
const float *ray_start;
const float *ray_dir;
unsigned int ob_index;
@@ -794,7 +793,7 @@ static void raycast_obj_cb(const bContext *C, SnapObjectContext *sctx, bool is_o
struct RaycastObjUserData *dt = data;
dt->ret |= raycastObj(
C, sctx,
dt->ray_orig, dt->ray_start, dt->ray_dir,
dt->ray_start, dt->ray_dir,
ob, obmat, dt->ob_index++, is_obedit,
dt->ray_depth,
dt->r_loc, dt->r_no, dt->r_index,
@@ -833,7 +832,7 @@ static void raycast_obj_cb(const bContext *C, SnapObjectContext *sctx, bool is_o
*/
static bool raycastObjects(
const bContext *C, SnapObjectContext *sctx,
const float ray_orig[3], const float ray_start[3], const float ray_dir[3],
const float ray_start[3], const float ray_dir[3],
const SnapSelect snap_select, const bool use_object_edit_cage,
/* read/write args */
float *ray_depth,
@@ -845,7 +844,6 @@ static bool raycastObjects(
Object *obedit = use_object_edit_cage ? sctx->scene->obedit : NULL;
struct RaycastObjUserData data = {
.ray_orig = ray_orig,
.ray_start = ray_start,
.ray_dir = ray_dir,
.ob_index = 0,
@@ -2218,7 +2216,7 @@ bool ED_transform_snap_object_project_ray_ex(
{
return raycastObjects(
C, sctx,
ray_start, ray_start, ray_normal,
ray_start, ray_normal,
params->snap_select, params->use_object_edit_cage,
ray_depth, r_loc, r_no, r_index, r_ob, r_obmat, NULL);
}
@@ -2247,7 +2245,7 @@ bool ED_transform_snap_object_project_ray_all(
bool retval = raycastObjects(
C, sctx,
ray_start, ray_start, ray_normal,
ray_start, ray_normal,
params->snap_select, params->use_object_edit_cage,
&ray_depth, NULL, NULL, NULL, NULL, NULL,
r_hit_list);
@@ -2430,7 +2428,7 @@ bool ED_transform_snap_object_project_view3d_ex(
if (snap_to == SCE_SNAP_MODE_FACE) {
return raycastObjects(
C, sctx,
ray_origin, ray_start, ray_normal,
ray_start, ray_normal,
params->snap_select, params->use_object_edit_cage,
ray_depth, r_loc, r_no, r_index, NULL, NULL, NULL);
}