[Bf-blender-cvs] [5e2c9e87cb3] custom-manipulators: revert file rename (since these are in 2.8x already)

Campbell Barton noreply at git.blender.org
Thu Apr 6 11:52:08 CEST 2017


Commit: 5e2c9e87cb3958b54dbd5a30070720282ee7f880
Author: Campbell Barton
Date:   Thu Apr 6 19:48:59 2017 +1000
Branches: custom-manipulators
https://developer.blender.org/rB5e2c9e87cb3958b54dbd5a30070720282ee7f880

revert file rename (since these are in 2.8x already)

===================================================================

M	source/blender/windowmanager/CMakeLists.txt
R099	source/blender/windowmanager/manipulators/intern/wm_manipulator_api.c	source/blender/windowmanager/manipulators/intern/wm_manipulator.c
R099	source/blender/windowmanager/manipulators/intern/wm_manipulator_group.c	source/blender/windowmanager/manipulators/intern/wm_manipulatorgroup.c
R100	source/blender/windowmanager/manipulators/intern/wm_manipulator_map.c	source/blender/windowmanager/manipulators/intern/wm_manipulatormap.c

===================================================================

diff --git a/source/blender/windowmanager/CMakeLists.txt b/source/blender/windowmanager/CMakeLists.txt
index a2db253da6d..1535d6da107 100644
--- a/source/blender/windowmanager/CMakeLists.txt
+++ b/source/blender/windowmanager/CMakeLists.txt
@@ -70,9 +70,9 @@ set(SRC
 	intern/wm_subwindow.c
 	intern/wm_window.c
 	intern/wm_stereo.c
-	manipulators/intern/wm_manipulator_api.c
-	manipulators/intern/wm_manipulator_group.c
-	manipulators/intern/wm_manipulator_map.c
+	manipulators/intern/wm_manipulator.c
+	manipulators/intern/wm_manipulatorgroup.c
+	manipulators/intern/wm_manipulatormap.c
 	manipulators/intern/manipulator_library/arrow_manipulator.c
 	manipulators/intern/manipulator_library/arrow2d_manipulator.c
 	manipulators/intern/manipulator_library/cage_manipulator.c
diff --git a/source/blender/windowmanager/manipulators/intern/wm_manipulator_api.c b/source/blender/windowmanager/manipulators/intern/wm_manipulator.c
similarity index 99%
rename from source/blender/windowmanager/manipulators/intern/wm_manipulator_api.c
rename to source/blender/windowmanager/manipulators/intern/wm_manipulator.c
index 33787931dc3..4bb873c1905 100644
--- a/source/blender/windowmanager/manipulators/intern/wm_manipulator_api.c
+++ b/source/blender/windowmanager/manipulators/intern/wm_manipulator.c
@@ -23,7 +23,7 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
-/** \file blender/windowmanager/manipulators/intern/wm_manipulator_api.c
+/** \file blender/windowmanager/manipulators/intern/wm_manipulator.c
  *  \ingroup wm
  */
 
diff --git a/source/blender/windowmanager/manipulators/intern/wm_manipulator_group.c b/source/blender/windowmanager/manipulators/intern/wm_manipulatorgroup.c
similarity index 99%
rename from source/blender/windowmanager/manipulators/intern/wm_manipulator_group.c
rename to source/blender/windowmanager/manipulators/intern/wm_manipulatorgroup.c
index 3954e832596..5074c6d0257 100644
--- a/source/blender/windowmanager/manipulators/intern/wm_manipulator_group.c
+++ b/source/blender/windowmanager/manipulators/intern/wm_manipulatorgroup.c
@@ -23,7 +23,7 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
-/** \file blender/windowmanager/manipulators/intern/wm_manipulator_group.c
+/** \file blender/windowmanager/manipulators/intern/wm_manipulatorgroup.c
  *  \ingroup wm
  *
  * \name Manipulator-Group
diff --git a/source/blender/windowmanager/manipulators/intern/wm_manipulator_map.c b/source/blender/windowmanager/manipulators/intern/wm_manipulatormap.c
similarity index 100%
rename from source/blender/windowmanager/manipulators/intern/wm_manipulator_map.c
rename to source/blender/windowmanager/manipulators/intern/wm_manipulatormap.c




More information about the Bf-blender-cvs mailing list