Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorClément Foucault <foucault.clem@gmail.com>2018-09-25 19:50:57 +0300
committerClément Foucault <foucault.clem@gmail.com>2018-09-25 23:51:54 +0300
commit2cff9b4cb605047927fbb1c774fdafcfd2ab534e (patch)
tree101d1efb5507a9dbde2934b04f081e77ed1e131b /source/blender/editors/render/render_shading.c
parent05d0e5315b99f939687838b50519d0702b4c8fb4 (diff)
Curves: Move draw options to overlays
This commit add one regression: it is impossible to currently hide handles in the viewport. But this should be fixed in another commit.
Diffstat (limited to 'source/blender/editors/render/render_shading.c')
-rw-r--r--source/blender/editors/render/render_shading.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/editors/render/render_shading.c b/source/blender/editors/render/render_shading.c
index 2dd4f328d06..78d3373c88c 100644
--- a/source/blender/editors/render/render_shading.c
+++ b/source/blender/editors/render/render_shading.c
@@ -186,6 +186,7 @@ void OBJECT_OT_material_slot_remove(wmOperatorType *ot)
static int material_slot_assign_exec(bContext *C, wmOperator *UNUSED(op))
{
Object *ob = ED_object_context(C);
+ View3D *v3d = CTX_wm_view3d(C);
if (!ob)
return OPERATOR_CANCELLED;
@@ -209,7 +210,7 @@ static int material_slot_assign_exec(bContext *C, wmOperator *UNUSED(op))
if (nurbs) {
for (nu = nurbs->first; nu; nu = nu->next) {
- if (ED_curve_nurb_select_check(ob->data, nu)) {
+ if (ED_curve_nurb_select_check(v3d, nu)) {
nu->mat_nr = ob->actcol - 1;
}
}