[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [42668] branches/soc-2011-onion-uv-tools: merge with trunk 42667
Antony Riakiotakis
kalast at gmail.com
Fri Dec 16 18:04:59 CET 2011
Revision: 42668
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=42668
Author: psy-fi
Date: 2011-12-16 17:04:44 +0000 (Fri, 16 Dec 2011)
Log Message:
-----------
merge with trunk 42667
Modified Paths:
--------------
branches/soc-2011-onion-uv-tools/extern/eltopo/CMakeLists.txt
branches/soc-2011-onion-uv-tools/extern/eltopo/common/gluvi.h
branches/soc-2011-onion-uv-tools/extern/eltopo/common/predicates.cpp
branches/soc-2011-onion-uv-tools/extern/eltopo/common/tunicate/orientation.cpp
branches/soc-2011-onion-uv-tools/extern/eltopo/common/tunicate/sos_orientation.cpp
branches/soc-2011-onion-uv-tools/extern/eltopo/eltopo3d/dynamicsurface.cpp
branches/soc-2011-onion-uv-tools/extern/eltopo/eltopo3d/surftrack.cpp
branches/soc-2011-onion-uv-tools/extern/libmv/CMakeLists.txt
branches/soc-2011-onion-uv-tools/extern/libmv/SConscript
branches/soc-2011-onion-uv-tools/extern/libmv/bundle.sh
branches/soc-2011-onion-uv-tools/extern/libmv/files.txt
branches/soc-2011-onion-uv-tools/extern/libmv/mkfiles.sh
branches/soc-2011-onion-uv-tools/intern/audaspace/intern/AUD_C-API.cpp
branches/soc-2011-onion-uv-tools/intern/ghost/intern/GHOST_SystemWin32.cpp
branches/soc-2011-onion-uv-tools/release/datafiles/splash.png
branches/soc-2011-onion-uv-tools/release/scripts/startup/bl_ui/properties_texture.py
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/BKE_blender.h
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/BKE_deform.h
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/BKE_object.h
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/BKE_tracking.h
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/DerivedMesh.c
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/armature.c
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/constraint.c
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/deform.c
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/image_gen.c
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/material.c
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/object.c
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/pointcache.c
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/tracking.c
branches/soc-2011-onion-uv-tools/source/blender/blenlib/BLI_math_base.h
branches/soc-2011-onion-uv-tools/source/blender/blenlib/BLI_math_geom.h
branches/soc-2011-onion-uv-tools/source/blender/blenlib/intern/math_base_inline.c
branches/soc-2011-onion-uv-tools/source/blender/blenlib/intern/math_geom.c
branches/soc-2011-onion-uv-tools/source/blender/blenloader/intern/readfile.c
branches/soc-2011-onion-uv-tools/source/blender/editors/animation/keyingsets.c
branches/soc-2011-onion-uv-tools/source/blender/editors/curve/curve_ops.c
branches/soc-2011-onion-uv-tools/source/blender/editors/curve/editcurve.c
branches/soc-2011-onion-uv-tools/source/blender/editors/datafiles/splash.png.c
branches/soc-2011-onion-uv-tools/source/blender/editors/include/ED_curve.h
branches/soc-2011-onion-uv-tools/source/blender/editors/include/ED_mesh.h
branches/soc-2011-onion-uv-tools/source/blender/editors/interface/interface.c
branches/soc-2011-onion-uv-tools/source/blender/editors/mesh/meshtools.c
branches/soc-2011-onion-uv-tools/source/blender/editors/object/object_relations.c
branches/soc-2011-onion-uv-tools/source/blender/editors/object/object_vgroup.c
branches/soc-2011-onion-uv-tools/source/blender/editors/sculpt_paint/paint_image.c
branches/soc-2011-onion-uv-tools/source/blender/editors/sculpt_paint/paint_vertex.c
branches/soc-2011-onion-uv-tools/source/blender/editors/space_action/action_select.c
branches/soc-2011-onion-uv-tools/source/blender/editors/space_api/spacetypes.c
branches/soc-2011-onion-uv-tools/source/blender/editors/space_clip/clip_ops.c
branches/soc-2011-onion-uv-tools/source/blender/editors/space_clip/tracking_ops.c
branches/soc-2011-onion-uv-tools/source/blender/editors/space_graph/graph_select.c
branches/soc-2011-onion-uv-tools/source/blender/editors/space_view3d/drawanimviz.c
branches/soc-2011-onion-uv-tools/source/blender/editors/space_view3d/drawvolume.c
branches/soc-2011-onion-uv-tools/source/blender/editors/space_view3d/view3d_buttons.c
branches/soc-2011-onion-uv-tools/source/blender/editors/transform/transform_ops.c
branches/soc-2011-onion-uv-tools/source/blender/gpu/GPU_extensions.h
branches/soc-2011-onion-uv-tools/source/blender/gpu/intern/gpu_codegen.c
branches/soc-2011-onion-uv-tools/source/blender/gpu/intern/gpu_draw.c
branches/soc-2011-onion-uv-tools/source/blender/gpu/intern/gpu_extensions.c
branches/soc-2011-onion-uv-tools/source/blender/gpu/intern/gpu_material.c
branches/soc-2011-onion-uv-tools/source/blender/gpu/intern/gpu_shader_material.glsl
branches/soc-2011-onion-uv-tools/source/blender/gpu/intern/gpu_shader_material.glsl.c
branches/soc-2011-onion-uv-tools/source/blender/imbuf/IMB_imbuf.h
branches/soc-2011-onion-uv-tools/source/blender/imbuf/intern/indexer.c
branches/soc-2011-onion-uv-tools/source/blender/makesdna/DNA_sequence_types.h
branches/soc-2011-onion-uv-tools/source/blender/makesdna/DNA_texture_types.h
branches/soc-2011-onion-uv-tools/source/blender/makesrna/intern/rna_material.c
branches/soc-2011-onion-uv-tools/source/blender/makesrna/intern/rna_object_api.c
branches/soc-2011-onion-uv-tools/source/blender/makesrna/intern/rna_sequencer.c
branches/soc-2011-onion-uv-tools/source/blender/modifiers/intern/MOD_cast.c
branches/soc-2011-onion-uv-tools/source/blender/modifiers/intern/MOD_hook.c
branches/soc-2011-onion-uv-tools/source/blender/modifiers/intern/MOD_meshdeform.c
branches/soc-2011-onion-uv-tools/source/blender/modifiers/intern/MOD_smooth.c
branches/soc-2011-onion-uv-tools/source/blender/python/intern/bpy_app.c
branches/soc-2011-onion-uv-tools/source/blender/python/intern/bpy_app_handlers.c
branches/soc-2011-onion-uv-tools/source/blender/python/intern/bpy_driver.c
branches/soc-2011-onion-uv-tools/source/blender/python/mathutils/mathutils_noise.c
branches/soc-2011-onion-uv-tools/source/blender/render/intern/source/render_texture.c
branches/soc-2011-onion-uv-tools/source/blender/windowmanager/intern/wm_draw.c
branches/soc-2011-onion-uv-tools/source/blender/windowmanager/intern/wm_init_exit.c
branches/soc-2011-onion-uv-tools/source/blender/windowmanager/intern/wm_operators.c
branches/soc-2011-onion-uv-tools/source/gameengine/Converter/BL_SkinDeformer.cpp
branches/soc-2011-onion-uv-tools/source/gameengine/Ketsji/BL_Texture.cpp
branches/soc-2011-onion-uv-tools/source/gameengine/Rasterizer/CMakeLists.txt
branches/soc-2011-onion-uv-tools/source/gameengine/Rasterizer/RAS_MeshObject.cpp
Property Changed:
----------------
branches/soc-2011-onion-uv-tools/
branches/soc-2011-onion-uv-tools/source/blender/editors/space_outliner/
Property changes on: branches/soc-2011-onion-uv-tools
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/soc-2011-cucumber:37517
/branches/soc-2011-tomato:42376,42378-42379,42397,42400
/trunk/blender:39665-42603
+ /branches/soc-2011-cucumber:37517
/branches/soc-2011-tomato:42376,42378-42379,42397,42400
/trunk/blender:39665-42667
Modified: branches/soc-2011-onion-uv-tools/extern/eltopo/CMakeLists.txt
===================================================================
--- branches/soc-2011-onion-uv-tools/extern/eltopo/CMakeLists.txt 2011-12-16 10:39:43 UTC (rev 42667)
+++ branches/soc-2011-onion-uv-tools/extern/eltopo/CMakeLists.txt 2011-12-16 17:04:44 UTC (rev 42668)
@@ -45,7 +45,6 @@
common/cubic_ccd_wrapper.cpp
common/fe_ccd_wrapper.cpp
common/fileio.cpp
- common/gluvi.cpp
common/levelset.cpp
common/makelevelset2.cpp
common/makelevelset3.cpp
@@ -82,7 +81,6 @@
common/clamped_spline.h
common/collisionqueries.h
common/fileio.h
- common/gluvi.h
common/grid3.h
common/hashtable.h
common/lapack_wrapper.h
@@ -122,7 +120,7 @@
common/tunicate/tunicate.h
)
-add_definitions(-DNOGUI)
+add_definitions(-DNO_GUI)
add_definitions(-DUSE_FORTRAN_BLAS)
blender_add_lib(extern_eltopo "${SRC}" "${INC}" "${INC_SYS}")
Modified: branches/soc-2011-onion-uv-tools/extern/eltopo/common/gluvi.h
===================================================================
--- branches/soc-2011-onion-uv-tools/extern/eltopo/common/gluvi.h 2011-12-16 10:39:43 UTC (rev 42667)
+++ branches/soc-2011-onion-uv-tools/extern/eltopo/common/gluvi.h 2011-12-16 17:04:44 UTC (rev 42668)
@@ -4,11 +4,13 @@
//#include <iostream>
//#include <vector>
+#ifdef USE_GUI
#ifdef __APPLE__
#include <GLUT/glut.h> // why does Apple have to put glut.h here...
#else
#include <GL/glut.h> // ...when everyone else puts it here?
#endif
+#endif
//#include "vec.h"
@@ -187,8 +189,10 @@
void ppm_screenshot(const char *filename_format, ...);
void sgi_screenshot(const char *filename_format, ...);
void set_generic_lights(void);
+#ifdef USE_GUI
void set_generic_material(float r, float g, float b, GLenum face=GL_FRONT_AND_BACK);
void set_matte_material(float r, float g, float b, GLenum face=GL_FRONT_AND_BACK);
+#endif
//@@@@@@@ USEFUL FUNCTIONALITY:
void draw_3d_arrow(const float base[3], const float point[3], float arrow_head_length=0);
//void draw_2d_arrow(const Vec2f base, const Vec2f point, float arrow_head_length);
Modified: branches/soc-2011-onion-uv-tools/extern/eltopo/common/predicates.cpp
===================================================================
--- branches/soc-2011-onion-uv-tools/extern/eltopo/common/predicates.cpp 2011-12-16 10:39:43 UTC (rev 42667)
+++ branches/soc-2011-onion-uv-tools/extern/eltopo/common/predicates.cpp 2011-12-16 17:04:44 UTC (rev 42668)
@@ -1,6 +1,11 @@
#include <cfloat>
#include "predicates.h"
+#if defined(_WIN32) && !defined(FREE_WINDOWS)
+#define random() rand() // not sure if this define is valid
+#define _Ios_Fmtflags ios::fmtflags
+#endif
+
static void print_hex( double d )
{
std::_Ios_Fmtflags originalFlags = std::cout.flags();
Modified: branches/soc-2011-onion-uv-tools/extern/eltopo/common/tunicate/orientation.cpp
===================================================================
--- branches/soc-2011-onion-uv-tools/extern/eltopo/common/tunicate/orientation.cpp 2011-12-16 10:39:43 UTC (rev 42667)
+++ branches/soc-2011-onion-uv-tools/extern/eltopo/common/tunicate/orientation.cpp 2011-12-16 17:04:44 UTC (rev 42668)
@@ -1,7 +1,16 @@
// Released into the public domain by Robert Bridson, 2009.
#include <cassert>
+#if defined(_WIN32) && !defined(FREE_WINDOWS)
+#include <float.h>
+#pragma fenv_access (on)
+#define FE_UPWARD _RC_UP
+#define FE_DOWNWARD _RC_DOWN
+#define FE_TONEAREST _RC_NEAR
+#define fesetround(r) (_controlfp(r, _MCW_RC))
+#else
#include <fenv.h>
+#endif
#include <cmath>
#include <limits>
#include "tunicate.h"
Modified: branches/soc-2011-onion-uv-tools/extern/eltopo/common/tunicate/sos_orientation.cpp
===================================================================
--- branches/soc-2011-onion-uv-tools/extern/eltopo/common/tunicate/sos_orientation.cpp 2011-12-16 10:39:43 UTC (rev 42667)
+++ branches/soc-2011-onion-uv-tools/extern/eltopo/common/tunicate/sos_orientation.cpp 2011-12-16 17:04:44 UTC (rev 42668)
@@ -2,7 +2,12 @@
#include <algorithm>
#include <cassert>
+#if defined(_WIN32) && !defined(FREE_WINDOWS)
+#include <float.h>
+#pragma fenv_access (on)
+#else
#include <fenv.h>
+#endif
#include <cmath>
#include <limits>
#include "tunicate.h"
Modified: branches/soc-2011-onion-uv-tools/extern/eltopo/eltopo3d/dynamicsurface.cpp
===================================================================
--- branches/soc-2011-onion-uv-tools/extern/eltopo/eltopo3d/dynamicsurface.cpp 2011-12-16 10:39:43 UTC (rev 42667)
+++ branches/soc-2011-onion-uv-tools/extern/eltopo/eltopo3d/dynamicsurface.cpp 2011-12-16 17:04:44 UTC (rev 42668)
@@ -18,6 +18,7 @@
#include <deque>
#include <queue>
+#ifdef USE_GUI
#ifdef __APPLE__
#include <OpenGL/gl.h>
#else
@@ -26,6 +27,7 @@
#endif
#include <GL/gl.h>
#endif
+#endif
#include <vec.h>
#include <mat.h>
Modified: branches/soc-2011-onion-uv-tools/extern/eltopo/eltopo3d/surftrack.cpp
===================================================================
--- branches/soc-2011-onion-uv-tools/extern/eltopo/eltopo3d/surftrack.cpp 2011-12-16 10:39:43 UTC (rev 42667)
+++ branches/soc-2011-onion-uv-tools/extern/eltopo/eltopo3d/surftrack.cpp 2011-12-16 17:04:44 UTC (rev 42668)
@@ -19,6 +19,7 @@
#include <vector>
#include <queue>
+#ifdef USE_GUI
#ifdef __APPLE__
#include <OpenGL/gl.h>
#include <GLUT/glut.h>
@@ -30,6 +31,7 @@
#include <GL/gl.h>
#include <GL/glut.h>
#endif
+#endif
#include <ccd_wrapper.h>
#include <cassert>
Modified: branches/soc-2011-onion-uv-tools/extern/libmv/CMakeLists.txt
===================================================================
--- branches/soc-2011-onion-uv-tools/extern/libmv/CMakeLists.txt 2011-12-16 10:39:43 UTC (rev 42667)
+++ branches/soc-2011-onion-uv-tools/extern/libmv/CMakeLists.txt 2011-12-16 17:04:44 UTC (rev 42668)
@@ -22,6 +22,10 @@
#
# ***** END GPL LICENSE BLOCK *****
+# NOTEL This file is automatically generated by bundle.sh script
+# If you're doing changes in this file, please update template
+# in that script too
+
set(INC
.
../Eigen3
Modified: branches/soc-2011-onion-uv-tools/extern/libmv/SConscript
===================================================================
--- branches/soc-2011-onion-uv-tools/extern/libmv/SConscript 2011-12-16 10:39:43 UTC (rev 42667)
+++ branches/soc-2011-onion-uv-tools/extern/libmv/SConscript 2011-12-16 17:04:44 UTC (rev 42668)
@@ -1,4 +1,9 @@
#!/usr/bin/python
+
+# NOTEL This file is automatically generated by bundle.sh script
+# If you're doing changes in this file, please update template
+# in that script too
+
import sys
import os
Modified: branches/soc-2011-onion-uv-tools/extern/libmv/bundle.sh
===================================================================
--- branches/soc-2011-onion-uv-tools/extern/libmv/bundle.sh 2011-12-16 10:39:43 UTC (rev 42667)
+++ branches/soc-2011-onion-uv-tools/extern/libmv/bundle.sh 2011-12-16 17:04:44 UTC (rev 42668)
@@ -33,14 +33,14 @@
chmod 664 ./third_party/glog/src/windows/*.cc ./third_party/glog/src/windows/*.h ./third_party/glog/src/windows/glog/*.h
-sources=`find ./libmv -type f -iname '*.cc' -or -iname '*.cpp' -or -iname '*.c' | sed -r 's/^\.\//\t/'`
-headers=`find ./libmv -type f -iname '*.h' | sed -r 's/^\.\//\t/'`
+sources=`find ./libmv -type f -iname '*.cc' -or -iname '*.cpp' -or -iname '*.c' | sed -r 's/^\.\//\t/' | sort -d`
+headers=`find ./libmv -type f -iname '*.h' | sed -r 's/^\.\//\t/' | sort -d`
-third_sources=`find ./third_party -type f -iname '*.cc' -or -iname '*.cpp' -or -iname '*.c' | grep -v glog | sed -r 's/^\.\//\t/'`
-third_headers=`find ./third_party -type f -iname '*.h' | grep -v glog | sed -r 's/^\.\//\t/'`
+third_sources=`find ./third_party -type f -iname '*.cc' -or -iname '*.cpp' -or -iname '*.c' | grep -v glog | sed -r 's/^\.\//\t/' | sort`
+third_headers=`find ./third_party -type f -iname '*.h' | grep -v glog | sed -r 's/^\.\//\t/' | sort`
-third_glog_sources=`find ./third_party -type f -iname '*.cc' -or -iname '*.cpp' -or -iname '*.c' | grep glog | grep -v windows | sed -r 's/^\.\//\t\t/'`
-third_glog_headers=`find ./third_party -type f -iname '*.h' | grep glog | grep -v windows | sed -r 's/^\.\//\t\t/'`
+third_glog_sources=`find ./third_party -type f -iname '*.cc' -or -iname '*.cpp' -or -iname '*.c' | grep glog | grep -v windows | sed -r 's/^\.\//\t\t/' | sort`
+third_glog_headers=`find ./third_party -type f -iname '*.h' | grep glog | grep -v windows | sed -r 's/^\.\//\t\t/' | sort`
src_dir=`find ./libmv -type f -iname '*.cc' -exec dirname {} \; -or -iname '*.cpp' -exec dirname {} \; -or -iname '*.c' -exec dirname {} \; | sed -r 's/^\.\//\t/' | sort | uniq`
src_third_dir=`find ./third_party -type f -iname '*.cc' -exec dirname {} \; -or -iname '*.cpp' -exec dirname {} \; -or -iname '*.c' -exec dirname {} \; | sed -r 's/^\.\//\t/' | sort | uniq`
@@ -89,7 +89,6 @@
done
cat > CMakeLists.txt << EOF
-# \$Id\$
# ***** BEGIN GPL LICENSE BLOCK *****
#
# This program is free software; you can redistribute it and/or
@@ -114,17 +113,21 @@
#
# ***** END GPL LICENSE BLOCK *****
+# NOTEL This file is automatically generated by bundle.sh script
+# If you're doing changes in this file, please update template
+# in that script too
+
set(INC
.
../Eigen3
- ./third_party/ssba
- ./third_party/ldl/Include
+ third_party/ssba
+ third_party/ldl/Include
../colamd/Include
)
set(INC_SYS
- ${PNG_INCLUDE_DIR}
- ${ZLIB_INCLUDE_DIRS}
+ \${PNG_INCLUDE_DIR}
+ \${ZLIB_INCLUDE_DIRS}
)
set(SRC
@@ -139,7 +142,7 @@
${third_headers}
)
-IF(WIN32)
+if(WIN32)
list(APPEND SRC
third_party/glog/src/logging.cc
third_party/glog/src/raw_logging.cc
@@ -167,28 +170,23 @@
)
list(APPEND INC
- ./third_party/glog/src/windows
+ third_party/glog/src/windows
)
- IF(NOT MINGW)
+ if(NOT MINGW)
list(APPEND INC
- ./third_party/msinttypes
+ third_party/msinttypes
)
- ENDIF(MINGW)
+ endif()
- list(APPEND INC
- ./third_party/glog/src/windows
- ./third_party/msinttypes
- )
-
- IF(MSVC)
+ if(MSVC)
set(MSVC_OFLAGS O1 O2 Ox)
foreach(FLAG \${MSVC_OFLAGS})
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list