[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [46112] branches/soc-2011-tomato: Merging r46096 through r46110 from trunk into soc-2011-tomato
Sergey Sharybin
sergey.vfx at gmail.com
Mon Apr 30 14:09:28 CEST 2012
Revision: 46112
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=46112
Author: nazgul
Date: 2012-04-30 12:09:25 +0000 (Mon, 30 Apr 2012)
Log Message:
-----------
Merging r46096 through r46110 from trunk into soc-2011-tomato
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=46096
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=46110
Modified Paths:
--------------
branches/soc-2011-tomato/CMakeLists.txt
branches/soc-2011-tomato/build_files/scons/config/win32-vc-config.py
branches/soc-2011-tomato/build_files/scons/config/win64-vc-config.py
branches/soc-2011-tomato/intern/cycles/kernel/kernel_camera.h
branches/soc-2011-tomato/intern/cycles/kernel/kernel_compat_opencl.h
branches/soc-2011-tomato/intern/cycles/kernel/svm/svm_gamma.h
branches/soc-2011-tomato/intern/cycles/util/util_boundbox.h
branches/soc-2011-tomato/intern/ghost/intern/GHOST_NDOFManager.cpp
branches/soc-2011-tomato/intern/smoke/intern/smoke_API.cpp
branches/soc-2011-tomato/source/blender/blenfont/intern/blf_lang.c
branches/soc-2011-tomato/source/blender/blenkernel/BKE_deform.h
branches/soc-2011-tomato/source/blender/blenkernel/intern/deform.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/object.c
branches/soc-2011-tomato/source/blender/blenlib/BLI_ghash.h
branches/soc-2011-tomato/source/blender/blenloader/intern/readfile.c
branches/soc-2011-tomato/source/blender/bmesh/operators/bmo_hull.c
branches/soc-2011-tomato/source/blender/editors/armature/editarmature.c
branches/soc-2011-tomato/source/blender/editors/space_view3d/drawobject.c
branches/soc-2011-tomato/source/blender/editors/space_view3d/drawvolume.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_userdef.c
branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_explode.c
branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_warp.c
branches/soc-2011-tomato/source/blender/python/bmesh/bmesh_py_types_meshdata.c
branches/soc-2011-tomato/source/creator/CMakeLists.txt
branches/soc-2011-tomato/source/tools/uncrustify.cfg
Property Changed:
----------------
branches/soc-2011-tomato/
branches/soc-2011-tomato/source/blender/editors/space_outliner/
Property changes on: branches/soc-2011-tomato
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/soc-2011-cucumber:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/vgroup_modifiers:38694-39989
/trunk/blender:36831-46095
+ /branches/soc-2011-cucumber:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/vgroup_modifiers:38694-39989
/trunk/blender:36831-46110
Modified: branches/soc-2011-tomato/CMakeLists.txt
===================================================================
--- branches/soc-2011-tomato/CMakeLists.txt 2012-04-30 12:08:17 UTC (rev 46111)
+++ branches/soc-2011-tomato/CMakeLists.txt 2012-04-30 12:09:25 UTC (rev 46112)
@@ -228,6 +228,7 @@
option(WITH_INSTALL_PORTABLE "Install redistributeable runtime, otherwise install into CMAKE_INSTALL_PREFIX" ON)
endif()
option(WITH_PYTHON_INSTALL "Copy system python into the blender install folder" ON)
+option(WITH_PYTHON_INSTALL_NUMPY "Copy system numpy into the blender install folder" ON)
option(WITH_MINGW64 "Use the 64-bit version of MinGW" OFF)
mark_as_advanced(WITH_MINGW64)
@@ -1612,6 +1613,13 @@
"to a valid python include path. Containing "
"Python.h for python version \"${PYTHON_VERSION}\"")
endif()
+
+ if(WITH_PYTHON_INSTALL_NUMPY)
+ if(NOT EXISTS "${PYTHON_LIBPATH}/python${PYTHON_VERSION}/site-packages/numpy")
+ message(WARNING "Numpy path '${PYTHON_LIBPATH}/python${PYTHON_VERSION}/site-packages/numpy' is missing, "
+ "WITH_PYTHON_INSTALL_NUMPY option will be ignored when installing python")
+ endif()
+ endif()
endif()
@@ -1668,7 +1676,7 @@
_setting)
set(_msg " * ${_setting}")
string(LENGTH "${_msg}" _len)
- while("28" GREATER "${_len}")
+ while("32" GREATER "${_len}")
set(_msg "${_msg} ")
math(EXPR _len "${_len} + 1")
endwhile()
@@ -1728,6 +1736,7 @@
info_cfg_text("Python:")
info_cfg_option(WITH_PYTHON_INSTALL)
+ info_cfg_option(WITH_PYTHON_INSTALL_NUMPY)
info_cfg_option(WITH_PYTHON_MODULE)
info_cfg_option(WITH_PYTHON_SAFETY)
Modified: branches/soc-2011-tomato/build_files/scons/config/win32-vc-config.py
===================================================================
--- branches/soc-2011-tomato/build_files/scons/config/win32-vc-config.py 2012-04-30 12:08:17 UTC (rev 46111)
+++ branches/soc-2011-tomato/build_files/scons/config/win32-vc-config.py 2012-04-30 12:09:25 UTC (rev 46112)
@@ -163,7 +163,7 @@
BF_BOOST_LIBPATH = '${BF_BOOST}/lib'
#CUDA
-WITH_BF_CYCLES_CUDA_BINARIES = True
+WITH_BF_CYCLES_CUDA_BINARIES = False
#BF_CYCLES_CUDA_NVCC = "" # Path to the nvidia compiler
BF_CYCLES_CUDA_BINARIES_ARCH = ['sm_13', 'sm_20', 'sm_21']
Modified: branches/soc-2011-tomato/build_files/scons/config/win64-vc-config.py
===================================================================
--- branches/soc-2011-tomato/build_files/scons/config/win64-vc-config.py 2012-04-30 12:08:17 UTC (rev 46111)
+++ branches/soc-2011-tomato/build_files/scons/config/win64-vc-config.py 2012-04-30 12:09:25 UTC (rev 46112)
@@ -160,7 +160,7 @@
BF_BOOST_LIBPATH = '${BF_BOOST}/lib'
#CUDA
-WITH_BF_CYCLES_CUDA_BINARIES = True
+WITH_BF_CYCLES_CUDA_BINARIES = False
#BF_CYCLES_CUDA_NVCC = "" # Path to the nvidia compiler
BF_CYCLES_CUDA_BINARIES_ARCH = ['sm_13', 'sm_20', 'sm_21']
Modified: branches/soc-2011-tomato/intern/cycles/kernel/kernel_camera.h
===================================================================
--- branches/soc-2011-tomato/intern/cycles/kernel/kernel_camera.h 2012-04-30 12:08:17 UTC (rev 46111)
+++ branches/soc-2011-tomato/intern/cycles/kernel/kernel_camera.h 2012-04-30 12:09:25 UTC (rev 46112)
@@ -130,7 +130,7 @@
float3 Pcamera = transform_perspective(&rastertocamera, make_float3(raster_x, raster_y, 0.0f));
/* create ray form raster position */
- ray->P = make_float3(0.0, 0.0f, 0.0f);
+ ray->P = make_float3(0.0f, 0.0f, 0.0f);
ray->D = equirectangular_to_direction(Pcamera.x, Pcamera.y);
/* transform ray from camera to world */
Modified: branches/soc-2011-tomato/intern/cycles/kernel/kernel_compat_opencl.h
===================================================================
--- branches/soc-2011-tomato/intern/cycles/kernel/kernel_compat_opencl.h 2012-04-30 12:08:17 UTC (rev 46111)
+++ branches/soc-2011-tomato/intern/cycles/kernel/kernel_compat_opencl.h 2012-04-30 12:09:25 UTC (rev 46112)
@@ -78,7 +78,7 @@
#define make_float2(x, y) ((float2)(x, y))
#ifdef __CL_NO_FLOAT3__
-#define make_float3(x, y, z) ((float4)(x, y, z, 0.0))
+#define make_float3(x, y, z) ((float4)(x, y, z, 0.0f))
#else
#define make_float3(x, y, z) ((float3)(x, y, z))
#endif
Modified: branches/soc-2011-tomato/intern/cycles/kernel/svm/svm_gamma.h
===================================================================
--- branches/soc-2011-tomato/intern/cycles/kernel/svm/svm_gamma.h 2012-04-30 12:08:17 UTC (rev 46111)
+++ branches/soc-2011-tomato/intern/cycles/kernel/svm/svm_gamma.h 2012-04-30 12:09:25 UTC (rev 46112)
@@ -23,11 +23,11 @@
float3 color = stack_load_float3(stack, in_color);
float gamma = stack_load_float(stack, in_gamma);
- if (color.x > 0.0)
+ if (color.x > 0.0f)
color.x = powf(color.x, gamma);
- if (color.y > 0.0)
+ if (color.y > 0.0f)
color.y = powf(color.y, gamma);
- if (color.z > 0.0)
+ if (color.z > 0.0f)
color.z = powf(color.z, gamma);
if (stack_valid(out_color))
Modified: branches/soc-2011-tomato/intern/cycles/util/util_boundbox.h
===================================================================
--- branches/soc-2011-tomato/intern/cycles/util/util_boundbox.h 2012-04-30 12:08:17 UTC (rev 46111)
+++ branches/soc-2011-tomato/intern/cycles/util/util_boundbox.h 2012-04-30 12:09:25 UTC (rev 46112)
@@ -50,7 +50,7 @@
{
}
- static struct empty_t {} empty;
+ enum empty_t { empty = 0};
__forceinline BoundBox(empty_t)
: min(make_float3(FLT_MAX, FLT_MAX, FLT_MAX)), max(make_float3(-FLT_MAX, -FLT_MAX, -FLT_MAX))
Modified: branches/soc-2011-tomato/intern/ghost/intern/GHOST_NDOFManager.cpp
===================================================================
--- branches/soc-2011-tomato/intern/ghost/intern/GHOST_NDOFManager.cpp 2012-04-30 12:08:17 UTC (rev 46111)
+++ branches/soc-2011-tomato/intern/ghost/intern/GHOST_NDOFManager.cpp 2012-04-30 12:09:25 UTC (rev 46112)
@@ -286,7 +286,7 @@
}
if (m_buttonMask == 0)
- m_buttonMask = ~(-1 << m_buttonCount);
+ m_buttonMask = (int) ~(UINT_MAX << m_buttonCount);
#ifdef DEBUG_NDOF_BUTTONS
printf("ndof: %d buttons -> hex:%X\n", m_buttonCount, m_buttonMask);
Modified: branches/soc-2011-tomato/intern/smoke/intern/smoke_API.cpp
===================================================================
--- branches/soc-2011-tomato/intern/smoke/intern/smoke_API.cpp 2012-04-30 12:08:17 UTC (rev 46111)
+++ branches/soc-2011-tomato/intern/smoke/intern/smoke_API.cpp 2012-04-30 12:09:25 UTC (rev 46112)
@@ -276,7 +276,7 @@
return fluid->_obstacles;
}
-extern "C" void smoke_get_ob_velocity(struct FLUID_3D *fluid, float **x, float **y, float **z)
+extern "C" void smoke_get_ob_velocity(FLUID_3D *fluid, float **x, float **y, float **z)
{
*x = fluid->_xVelocityOb;
*y = fluid->_yVelocityOb;
Modified: branches/soc-2011-tomato/source/blender/blenfont/intern/blf_lang.c
===================================================================
--- branches/soc-2011-tomato/source/blender/blenfont/intern/blf_lang.c 2012-04-30 12:08:17 UTC (rev 46111)
+++ branches/soc-2011-tomato/source/blender/blenfont/intern/blf_lang.c 2012-04-30 12:09:25 UTC (rev 46112)
@@ -106,6 +106,7 @@
"serbian (latin)", "sr_RS at latin",
"kyrgyz", "ky_KG",
"turkish", "tr_TR",
+ "hungarian", "hu_HU",
};
void BLF_lang_init(void)
Modified: branches/soc-2011-tomato/source/blender/blenkernel/BKE_deform.h
===================================================================
--- branches/soc-2011-tomato/source/blender/blenkernel/BKE_deform.h 2012-04-30 12:08:17 UTC (rev 46111)
+++ branches/soc-2011-tomato/source/blender/blenkernel/BKE_deform.h 2012-04-30 12:09:25 UTC (rev 46112)
@@ -71,7 +71,10 @@
/* utility function, note that 32 chars is the maximum string length since its only
* used with defgroups currently */
-int BKE_deform_is_char_sep(const char c);
+
+void BKE_deform_split_suffix(const char string[MAX_VGROUP_NAME], char base[MAX_VGROUP_NAME], char ext[MAX_VGROUP_NAME]);
+void BKE_deform_split_prefix(const char string[MAX_VGROUP_NAME], char base[MAX_VGROUP_NAME], char ext[MAX_VGROUP_NAME]);
+
void flip_side_name(char name[64], const char from_name[64], int strip_number);
#endif
Modified: branches/soc-2011-tomato/source/blender/blenkernel/intern/deform.c
===================================================================
--- branches/soc-2011-tomato/source/blender/blenkernel/intern/deform.c 2012-04-30 12:08:17 UTC (rev 46111)
+++ branches/soc-2011-tomato/source/blender/blenkernel/intern/deform.c 2012-04-30 12:09:25 UTC (rev 46112)
@@ -437,11 +437,51 @@
BLI_uniquename_cb(defgroup_unique_check, &data, "Group", '.', dg->name, sizeof(dg->name));
}
-int BKE_deform_is_char_sep(const char c)
+static int is_char_sep(const char c)
{
return ELEM4(c, '.', ' ', '-', '_');
}
+/* based on BLI_split_dirfile() / os.path.splitext(), "a.b.c" -> ("a.b", ".c") */
+
+void BKE_deform_split_suffix(const char string[MAX_VGROUP_NAME], char body[MAX_VGROUP_NAME], char suf[MAX_VGROUP_NAME])
+{
+ size_t len = BLI_strnlen(string, MAX_VGROUP_NAME);
+ size_t i;
+
+ body[0] = suf[0] = '\0';
+
+ for (i = len - 1; i > 1; i--) {
+ if (is_char_sep(string[i])) {
+ BLI_strncpy(body, string, i + 1);
+ BLI_strncpy(suf, string + i, (len + 1) - i);
+ return;
+ }
+ }
+
+ BLI_strncpy(body, string, len);
+}
+
+/* "a.b.c" -> ("a.", "b.c") */
+void BKE_deform_split_prefix(const char string[MAX_VGROUP_NAME], char pre[MAX_VGROUP_NAME], char body[MAX_VGROUP_NAME])
+{
+ size_t len = BLI_strnlen(string, MAX_VGROUP_NAME);
+ size_t i;
+
+ body[0] = pre[0] = '\0';
+
+ for (i = 1; i < len; i++) {
+ if (is_char_sep(string[i])) {
+ i++;
+ BLI_strncpy(pre, string, i + 1);
+ BLI_strncpy(body, string + i, (len + 1) - i);
+ return;
+ }
+ }
+
+ BLI_strncpy(body, string, len);
+}
+
/* finds the best possible flipped name. For renaming; check for unique names afterwards */
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list