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:
-rwxr-xr-xbuild_files/cmake/project_info.py4
-rw-r--r--source/blender/bmesh/CMakeLists.txt8
-rw-r--r--source/blender/bmesh/operators/bmo_fill_edgeloop.c (renamed from source/blender/bmesh/operators/bmo_edgeloop_fill.c)2
-rw-r--r--source/blender/bmesh/operators/bmo_fill_grid.c (renamed from source/blender/bmesh/operators/bmo_grid_fill.c)2
-rw-r--r--source/blender/bmesh/operators/bmo_split_edges.c (renamed from source/blender/bmesh/operators/bmo_edgesplit.c)2
5 files changed, 9 insertions, 9 deletions
diff --git a/build_files/cmake/project_info.py b/build_files/cmake/project_info.py
index 73648be3f15..5d756a6320f 100755
--- a/build_files/cmake/project_info.py
+++ b/build_files/cmake/project_info.py
@@ -26,8 +26,8 @@
Example Win32 usage:
c:\Python32\python.exe c:\blender_dev\blender\build_files\cmake\cmake_qtcreator_project.py c:\blender_dev\cmake_build
-example linux usage
- python .~/blenderSVN/blender/build_files/cmake/cmake_qtcreator_project.py ~/blenderSVN/cmake
+Example Linux usage:
+ python ~/blenderSVN/blender/build_files/cmake/cmake_qtcreator_project.py ~/blenderSVN/cmake
"""
__all__ = (
diff --git a/source/blender/bmesh/CMakeLists.txt b/source/blender/bmesh/CMakeLists.txt
index 9114a183e2d..bacf390a87b 100644
--- a/source/blender/bmesh/CMakeLists.txt
+++ b/source/blender/bmesh/CMakeLists.txt
@@ -46,11 +46,10 @@ set(SRC
operators/bmo_create.c
operators/bmo_dissolve.c
operators/bmo_dupe.c
- operators/bmo_edgeloop_fill.c
operators/bmo_edgenet.c
- operators/bmo_edgesplit.c
operators/bmo_extrude.c
- operators/bmo_grid_fill.c
+ operators/bmo_fill_edgeloop.c
+ operators/bmo_fill_grid.c
operators/bmo_hull.c
operators/bmo_inset.c
operators/bmo_join_triangles.c
@@ -61,8 +60,9 @@ set(SRC
operators/bmo_removedoubles.c
operators/bmo_similar.c
operators/bmo_smooth_laplacian.c
- operators/bmo_symmetrize.c
+ operators/bmo_split_edges.c
operators/bmo_subdivide.c
+ operators/bmo_symmetrize.c
operators/bmo_triangulate.c
operators/bmo_unsubdivide.c
operators/bmo_utils.c
diff --git a/source/blender/bmesh/operators/bmo_edgeloop_fill.c b/source/blender/bmesh/operators/bmo_fill_edgeloop.c
index 604feeeef5d..f80eafd4135 100644
--- a/source/blender/bmesh/operators/bmo_edgeloop_fill.c
+++ b/source/blender/bmesh/operators/bmo_fill_edgeloop.c
@@ -20,7 +20,7 @@
* ***** END GPL LICENSE BLOCK *****
*/
-/** \file blender/bmesh/operators/bmo_edgeloop_fill.c
+/** \file blender/bmesh/operators/bmo_fill_edgeloop.c
* \ingroup bmesh
*
* Fill discreet edge loop(s) with faces.
diff --git a/source/blender/bmesh/operators/bmo_grid_fill.c b/source/blender/bmesh/operators/bmo_fill_grid.c
index 58bc0c86b4d..3d865f70ccb 100644
--- a/source/blender/bmesh/operators/bmo_grid_fill.c
+++ b/source/blender/bmesh/operators/bmo_fill_grid.c
@@ -20,7 +20,7 @@
* ***** END GPL LICENSE BLOCK *****
*/
-/** \file blender/bmesh/operators/bmo_grid_fill.c
+/** \file blender/bmesh/operators/bmo_fill_grid.c
* \ingroup bmesh
*
* Fill 2 isolated, open edge loops with a grid of quads.
diff --git a/source/blender/bmesh/operators/bmo_edgesplit.c b/source/blender/bmesh/operators/bmo_split_edges.c
index 8ac6c46f6cf..c0847930422 100644
--- a/source/blender/bmesh/operators/bmo_edgesplit.c
+++ b/source/blender/bmesh/operators/bmo_split_edges.c
@@ -20,7 +20,7 @@
* ***** END GPL LICENSE BLOCK *****
*/
-/** \file blender/bmesh/operators/bmo_edgesplit.c
+/** \file blender/bmesh/operators/bmo_split_edges.c
* \ingroup bmesh
*
* Just a wrapper around #BM_mesh_edgesplit