merge with trunk at r31523
[blender.git] / source / blender / editors / transform / transform_snap.c
index a5a02261ffc7fb51c1d9ec2c1d58d8cedf2026d3..3dbd83bfa52b4913639efcc1c7eca8bbe441734e 100644 (file)
@@ -36,6 +36,7 @@
 
 #include "DNA_armature_types.h"
 #include "DNA_scene_types.h"
+#include "DNA_object_types.h"
 #include "DNA_meshdata_types.h" // Temporary, for snapping to other unselected meshes
 #include "DNA_space_types.h"
 #include "DNA_screen_types.h"
 //#include "editmesh.h"
 //#include "BIF_editsima.h"
 #include "BIF_gl.h"
-#include "BIF_glutil.h"
 //#include "BIF_mywindow.h"
 //#include "BIF_screen.h"
 //#include "BIF_editsima.h"
 //#include "BIF_drawimage.h"
 //#include "BIF_editmesh.h"
 
-#include "BKE_global.h"
-#include "BKE_utildefines.h"
 #include "BKE_DerivedMesh.h"
 #include "BKE_object.h"
 #include "BKE_anim.h" /* for duplis */
@@ -444,9 +442,9 @@ void initSnapping(TransInfo *t, wmOperator *op)
                                normalize_v3(t->tsnap.snapNormal);
                        }
 
-                       if (RNA_struct_find_property(op->ptr, "snap_project"))
+                       if (RNA_struct_find_property(op->ptr, "use_snap_project"))
                        {
-                               t->tsnap.project = RNA_boolean_get(op->ptr, "snap_project");
+                               t->tsnap.project = RNA_boolean_get(op->ptr, "use_snap_project");
                        }
                }
        }