[Bf-blender-cvs] [5b01e428a94] blender2.8: Move eval_ctx after object mode changes
Campbell Barton
noreply at git.blender.org
Wed Feb 7 06:38:26 CET 2018
Commit: 5b01e428a9443254b30cff015c42cee10d1ab142
Author: Campbell Barton
Date: Wed Feb 7 16:36:12 2018 +1100
Branches: blender2.8
https://developer.blender.org/rB5b01e428a9443254b30cff015c42cee10d1ab142
Move eval_ctx after object mode changes
===================================================================
M source/blender/editors/sculpt_paint/paint_vertex.c
===================================================================
diff --git a/source/blender/editors/sculpt_paint/paint_vertex.c b/source/blender/editors/sculpt_paint/paint_vertex.c
index c94f736bf4e..43bb19639cf 100644
--- a/source/blender/editors/sculpt_paint/paint_vertex.c
+++ b/source/blender/editors/sculpt_paint/paint_vertex.c
@@ -1085,10 +1085,6 @@ static int wpaint_mode_toggle_exec(bContext *C, wmOperator *op)
paint_cursor_delete_textures();
}
else {
- EvaluationContext eval_ctx;
-
- CTX_data_eval_ctx(C, &eval_ctx);
-
ob->mode |= mode_flag;
if (wp == NULL)
@@ -1106,6 +1102,9 @@ static int wpaint_mode_toggle_exec(bContext *C, wmOperator *op)
if (ob->sculpt) {
BKE_sculptsession_free(ob);
}
+
+ EvaluationContext eval_ctx;
+ CTX_data_eval_ctx(C, &eval_ctx);
vertex_paint_init_session(&eval_ctx, scene, ob);
}
@@ -2260,10 +2259,6 @@ static int vpaint_mode_toggle_exec(bContext *C, wmOperator *op)
paint_cursor_delete_textures();
}
else {
- EvaluationContext eval_ctx;
-
- CTX_data_eval_ctx(C, &eval_ctx);
-
ob->mode |= mode_flag;
ED_mesh_color_ensure(me, NULL);
@@ -2283,6 +2278,9 @@ static int vpaint_mode_toggle_exec(bContext *C, wmOperator *op)
}
BKE_sculptsession_free(ob);
}
+
+ EvaluationContext eval_ctx;
+ CTX_data_eval_ctx(C, &eval_ctx);
vertex_paint_init_session(&eval_ctx, scene, ob);
}
More information about the Bf-blender-cvs
mailing list