[Bf-blender-cvs] [f48895f74a2] master: Correct accidental changes by C Logging addition
Campbell Barton
noreply at git.blender.org
Sun Apr 1 10:24:08 CEST 2018
Commit: f48895f74a202879b5de0fe457a37af221c4e36d
Author: Campbell Barton
Date: Sun Apr 1 10:16:28 2018 +0200
Branches: master
https://developer.blender.org/rBf48895f74a202879b5de0fe457a37af221c4e36d
Correct accidental changes by C Logging addition
Error in 891c1cfc9a3
===================================================================
M release/scripts/startup/bl_ui/space_view3d.py
M source/blender/depsgraph/intern/eval/deg_eval.cc
M source/blender/python/mathutils/mathutils_Euler.c
===================================================================
diff --git a/release/scripts/startup/bl_ui/space_view3d.py b/release/scripts/startup/bl_ui/space_view3d.py
index fbda0df18a6..a618ef7fd4e 100644
--- a/release/scripts/startup/bl_ui/space_view3d.py
+++ b/release/scripts/startup/bl_ui/space_view3d.py
@@ -2668,8 +2668,8 @@ class VIEW3D_MT_edit_mesh_vertices(Menu):
layout.operator("object.vertex_parent_set")
-class VIEW3D_MT_edit_mesh_edges(Menu):
- bl_label = "Edges"
+class VIEW3D_MT_edit_mesh_edges_data(Menu):
+ bl_label = "Edge Data"
def draw(self, context):
layout = self.layout
@@ -2678,13 +2678,6 @@ class VIEW3D_MT_edit_mesh_edges(Menu):
layout.operator_context = 'INVOKE_REGION_WIN'
- layout.operator("mesh.edge_face_add")
- layout.operator("mesh.subdivide")
- layout.operator("mesh.subdivide_edgering")
- layout.operator("mesh.unsubdivide")
-
- layout.separator()
-
layout.operator("transform.edge_crease")
layout.operator("transform.edge_bevelweight")
@@ -2705,6 +2698,26 @@ class VIEW3D_MT_edit_mesh_edges(Menu):
layout.operator("mesh.mark_freestyle_edge", text="Clear Freestyle Edge").clear = True
layout.separator()
+
+class VIEW3D_MT_edit_mesh_edges(Menu):
+ bl_label = "Edges"
+
+ def draw(self, context):
+ layout = self.layout
+
+ layout.operator_context = 'INVOKE_REGION_WIN'
+
+ layout.operator("mesh.edge_face_add")
+ layout.operator("mesh.subdivide")
+ layout.operator("mesh.subdivide_edgering")
+ layout.operator("mesh.unsubdivide")
+
+ layout.separator()
+
+ layout.menu("VIEW3D_MT_edit_mesh_edges_data")
+
+ layout.separator()
+
layout.operator("mesh.edge_rotate", text="Rotate Edge CW").use_ccw = False
layout.operator("mesh.edge_rotate", text="Rotate Edge CCW").use_ccw = True
@@ -4111,6 +4124,7 @@ classes = (
VIEW3D_MT_edit_mesh_extrude,
VIEW3D_MT_edit_mesh_vertices,
VIEW3D_MT_edit_mesh_edges,
+ VIEW3D_MT_edit_mesh_edges_data,
VIEW3D_MT_edit_mesh_faces,
VIEW3D_MT_edit_mesh_normals,
VIEW3D_MT_edit_mesh_clean,
diff --git a/source/blender/depsgraph/intern/eval/deg_eval.cc b/source/blender/depsgraph/intern/eval/deg_eval.cc
index 92518ba73e4..fc71b5ccb7b 100644
--- a/source/blender/depsgraph/intern/eval/deg_eval.cc
+++ b/source/blender/depsgraph/intern/eval/deg_eval.cc
@@ -252,6 +252,9 @@ void deg_evaluate_on_refresh(EvaluationContext *eval_ctx,
Depsgraph *graph,
const unsigned int layers)
{
+ /* Set time for the current graph evaluation context. */
+ TimeSourceDepsNode *time_src = graph->find_time_source();
+ eval_ctx->ctime = time_src->cfra;
/* Nothing to update, early out. */
if (BLI_gset_len(graph->entry_tags) == 0) {
return;
@@ -262,9 +265,6 @@ void deg_evaluate_on_refresh(EvaluationContext *eval_ctx,
graph->layers);
const bool do_time_debug = ((G.debug & G_DEBUG_DEPSGRAPH_TIME) != 0);
const double start_time = do_time_debug ? PIL_check_seconds_timer() : 0;
- /* Set time for the current graph evaluation context. */
- TimeSourceDepsNode *time_src = graph->find_time_source();
- eval_ctx->ctime = time_src->cfra;
/* Set up evaluation context for depsgraph itself. */
DepsgraphEvalState state;
state.eval_ctx = eval_ctx;
diff --git a/source/blender/python/mathutils/mathutils_Euler.c b/source/blender/python/mathutils/mathutils_Euler.c
index 9492b6d67f3..026384743bd 100644
--- a/source/blender/python/mathutils/mathutils_Euler.c
+++ b/source/blender/python/mathutils/mathutils_Euler.c
@@ -689,6 +689,8 @@ PyDoc_STRVAR(euler_doc,
"\n"
" This object gives access to Eulers in Blender.\n"
"\n"
+" .. seealso:: `Euler angles <https://en.wikipedia.org/wiki/Euler_angles>`__ on Wikipedia.\n"
+"\n"
" :param angles: Three angles, in radians.\n"
" :type angles: 3d vector\n"
" :param order: Optional order of the angles, a permutation of ``XYZ``.\n"
More information about the Bf-blender-cvs
mailing list