BLI_utildefines: rename pointer conversion macros

Terms get/set don't make much sense when casting values.

Name macros so the conversion is obvious,
use common prefix for easier completion.

- GET_INT_FROM_POINTER  -> POINTER_AS_INT
- SET_INT_IN_POINTER    -> POINTER_FROM_INT
- GET_UINT_FROM_POINTER -> POINTER_AS_UINT
- SET_UINT_IN_POINTER   -> POINTER_FROM_UINT

2 files changed, 9 insertions, 9 deletions

diff --git a/source/blender/freestyle/intern/geometry/Grid.h b/source/blender/freestyle/intern/geometry/Grid.h
index 62c0e58232a..7d025a6a7f1 100644
--- a/source/blender/freestyle/intern/geometry/Grid.h
+++ b/source/blender/freestyle/intern/geometry/Grid.h
@@ -30,7 +30,7 @@
 
 #include <cstring> // for memset
 #include <float.h>
-#include <stdint.h> // For SET_UINT_IN_POINTER, i.e. uintptr_t.
+#include <stdint.h> // For POINTER_FROM_UINT, i.e. uintptr_t.
 #include <vector>
 
 #include "Geom.h"
@@ -338,8 +338,8 @@ protected:
 				visitor.discoverCell(current_cell);
 				OccludersSet& occluders = current_cell->getOccluders(); // FIXME: I had forgotten the ref &
 				for (OccludersSet::iterator it = occluders.begin(); it != occluders.end(); it++) {
-					if (GET_UINT_FROM_POINTER((*it)->userdata2) != _timestamp) {
-						(*it)->userdata2 = SET_UINT_IN_POINTER(_timestamp);
+					if (POINTER_AS_UINT((*it)->userdata2) != _timestamp) {
+						(*it)->userdata2 = POINTER_FROM_UINT(_timestamp);
 						visitor.examineOccluder(*it);
 					}
 				}
diff --git a/source/blender/freestyle/intern/view_map/ViewMapIO.cpp b/source/blender/freestyle/intern/view_map/ViewMapIO.cpp
index f59291d910f..c0562cbb417 100644
--- a/source/blender/freestyle/intern/view_map/ViewMapIO.cpp
+++ b/source/blender/freestyle/intern/view_map/ViewMapIO.cpp
@@ -1102,17 +1102,17 @@ int save(ostream& out, ViewMap *vm, ProgressBar *pb)
 
 	// For every object, initialize its userdata member to its index in the ViewMap list
 	for (unsigned int i0 = 0; i0 < vm->ViewShapes().size(); i0++) {
-		vm->ViewShapes()[i0]->userdata = SET_UINT_IN_POINTER(i0);
-		vm->ViewShapes()[i0]->sshape()->userdata = SET_UINT_IN_POINTER(i0);
+		vm->ViewShapes()[i0]->userdata = POINTER_FROM_UINT(i0);
+		vm->ViewShapes()[i0]->sshape()->userdata = POINTER_FROM_UINT(i0);
 	}
 	for (unsigned int i1 = 0; i1 < vm->FEdges().size(); i1++)
-		vm->FEdges()[i1]->userdata = SET_UINT_IN_POINTER(i1);
+		vm->FEdges()[i1]->userdata = POINTER_FROM_UINT(i1);
 	for (unsigned int i2 = 0; i2 < vm->SVertices().size(); i2++)
-		vm->SVertices()[i2]->userdata = SET_UINT_IN_POINTER(i2);
+		vm->SVertices()[i2]->userdata = POINTER_FROM_UINT(i2);
 	for (unsigned int i3 = 0; i3 < vm->ViewEdges().size(); i3++)
-		vm->ViewEdges()[i3]->userdata = SET_UINT_IN_POINTER(i3);
+		vm->ViewEdges()[i3]->userdata = POINTER_FROM_UINT(i3);
 	for (unsigned int i4 = 0; i4 < vm->ViewVertices().size(); i4++)
-		vm->ViewVertices()[i4]->userdata = SET_UINT_IN_POINTER(i4);
+		vm->ViewVertices()[i4]->userdata = POINTER_FROM_UINT(i4);
 
 	// Write the current options
 	unsigned char flags = Options::getFlags();