diff options
Diffstat (limited to 'projectfiles_vc9/blender/BPY_python/BPY_python.vcproj')
| -rw-r--r-- | projectfiles_vc9/blender/BPY_python/BPY_python.vcproj | 76 |
1 files changed, 69 insertions, 7 deletions
diff --git a/projectfiles_vc9/blender/BPY_python/BPY_python.vcproj b/projectfiles_vc9/blender/BPY_python/BPY_python.vcproj index f226ad5a72c..29a297d6f6a 100644 --- a/projectfiles_vc9/blender/BPY_python/BPY_python.vcproj +++ b/projectfiles_vc9/blender/BPY_python/BPY_python.vcproj @@ -380,15 +380,18 @@ >
</File>
<File
- RelativePath="..\..\..\source\blender\python\generic\bpy_internal_import.c"
+<<<<<<< .working
+=======
+ RelativePath="..\..\..\source\blender\python\generic\blf_api.c"
>
</File>
<File
- RelativePath="..\..\..\source\blender\python\generic\euler.c"
+>>>>>>> .merge-right.r30358
+ RelativePath="..\..\..\source\blender\python\generic\bpy_internal_import.c"
>
</File>
<File
- RelativePath="..\..\..\source\blender\python\generic\Geometry.c"
+ RelativePath="..\..\..\source\blender\python\generic\geometry.c"
>
</File>
<File
@@ -396,19 +399,27 @@ >
</File>
<File
- RelativePath="..\..\..\source\blender\python\generic\Mathutils.c"
+ RelativePath="..\..\..\source\blender\python\generic\mathutils.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\source\blender\python\generic\mathutils_color.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\source\blender\python\generic\mathutils_euler.c"
>
</File>
<File
- RelativePath="..\..\..\source\blender\python\generic\matrix.c"
+ RelativePath="..\..\..\source\blender\python\generic\mathutils_matrix.c"
>
</File>
<File
- RelativePath="..\..\..\source\blender\python\generic\quat.c"
+ RelativePath="..\..\..\source\blender\python\generic\mathutils_quat.c"
>
</File>
<File
- RelativePath="..\..\..\source\blender\python\generic\vector.c"
+ RelativePath="..\..\..\source\blender\python\generic\mathutils_vector.c"
>
</File>
</Filter>
@@ -457,6 +468,57 @@ >
</File>
</Filter>
+<<<<<<< .working
+=======
+ <Filter
+ Name="generic"
+ >
+ <File
+ RelativePath="..\..\..\source\blender\python\generic\bgl.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\source\blender\python\generic\blf_api.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\source\blender\python\generic\bpy_internal_import.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\source\blender\python\generic\geometry.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\source\blender\python\generic\IDProp.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\source\blender\python\generic\mathutils.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\source\blender\python\generic\mathutils_color.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\source\blender\python\generic\mathutils_euler.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\source\blender\python\generic\mathutils_matrix.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\source\blender\python\generic\mathutils_quat.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\source\blender\python\generic\mathutils_vector.h"
+ >
+ </File>
+ </Filter>
+>>>>>>> .merge-right.r30358
</Filter>
</Files>
<Globals>
|