[Bf-blender-cvs] [8127294] experimental-build: Revert to 4aa51096a7, with buildbot config tweaks.
Bastien Montagne
noreply at git.blender.org
Sun Oct 11 21:38:42 CEST 2015
Commit: 812729407d80e201b649b4f621a68969ca47c18f
Author: Bastien Montagne
Date: Sun Oct 11 21:38:08 2015 +0200
Branches: experimental-build
https://developer.blender.org/rB812729407d80e201b649b4f621a68969ca47c18f
Revert to 4aa51096a7, with buildbot config tweaks.
===================================================================
M CMakeLists.txt
M GNUmakefile
M build_files/buildbot/slave_test.py
M build_files/package_spec/pacman/PKGBUILD
M extern/libmv/libmv/multiview/homography.cc
M intern/audaspace/intern/AUD_AnimateableProperty.cpp
M intern/cycles/blender/addon/version_update.py
M intern/cycles/bvh/bvh_build.cpp
M intern/cycles/bvh/bvh_params.h
M intern/cycles/kernel/closure/bsdf_diffuse_ramp.h
M intern/cycles/kernel/closure/bsdf_phong_ramp.h
M intern/cycles/kernel/geom/geom_triangle_intersect.h
M intern/cycles/kernel/kernel_emission.h
M intern/cycles/kernel/kernel_shader.h
M intern/cycles/kernel/osl/osl_shader.cpp
M intern/cycles/kernel/svm/svm_closure.h
M intern/ghost/CMakeLists.txt
M intern/ghost/intern/GHOST_ContextCGL.mm
M intern/ghost/intern/GHOST_EventDragnDrop.h
M intern/ghost/intern/GHOST_SystemCocoa.mm
M release/scripts/addons
M release/scripts/modules/bpy/path.py
M release/scripts/modules/bpy_extras/io_utils.py
M release/scripts/presets/interface_theme/back_to_black.xml
M release/scripts/presets/interface_theme/blender_24x.xml
M release/scripts/presets/interface_theme/elsyiun.xml
M release/scripts/presets/interface_theme/flatty_light.xml
M release/scripts/presets/interface_theme/graph.xml
M release/scripts/presets/interface_theme/hexagon.xml
M release/scripts/presets/interface_theme/rtheme.xml
M release/scripts/presets/interface_theme/science_lab.xml
M release/scripts/presets/interface_theme/softimage.xml
M release/scripts/presets/interface_theme/ubuntu_ambiance.xml
M release/scripts/startup/bl_ui/properties_data_modifier.py
M release/scripts/startup/bl_ui/space_view3d.py
M source/blender/blenkernel/BKE_blender.h
M source/blender/blenkernel/intern/cdderivedmesh.c
M source/blender/blenkernel/intern/data_transfer.c
M source/blender/blenkernel/intern/deform.c
M source/blender/blenkernel/intern/displist.c
M source/blender/blenkernel/intern/library.c
M source/blender/blenkernel/intern/mesh_evaluate.c
M source/blender/blenkernel/intern/seqmodifier.c
M source/blender/blenkernel/intern/smoke.c
M source/blender/blenlib/BLI_math_vector.h
M source/blender/blenlib/BLI_rect.h
M source/blender/blenlib/intern/math_vector_inline.c
M source/blender/blenlib/intern/rct.c
M source/blender/blenloader/intern/versioning_270.c
M source/blender/bmesh/intern/bmesh_queries.c
M source/blender/compositor/intern/COM_NodeOperationBuilder.cpp
M source/blender/compositor/operations/COM_MovieClipOperation.cpp
M source/blender/editors/animation/keyframes_general.c
M source/blender/editors/armature/armature_edit.c
M source/blender/editors/include/ED_render.h
M source/blender/editors/include/ED_view3d.h
M source/blender/editors/object/object_shapekey.c
M source/blender/editors/render/render_opengl.c
M source/blender/editors/render/render_update.c
M source/blender/editors/sculpt_paint/paint_image_2d.c
M source/blender/editors/space_action/action_edit.c
M source/blender/editors/space_outliner/outliner_tools.c
M source/blender/editors/space_view3d/drawobject.c
M source/blender/editors/space_view3d/space_view3d.c
M source/blender/editors/space_view3d/view3d_draw.c
M source/blender/editors/transform/transform.c
M source/blender/editors/transform/transform.h
M source/blender/editors/transform/transform_snap.c
M source/blender/gpu/intern/gpu_buffers.c
M source/blender/makesrna/intern/rna_access.c
M source/blender/makesrna/intern/rna_curve.c
M source/blender/makesrna/intern/rna_mesh_api.c
M source/blender/makesrna/intern/rna_modifier.c
M source/blender/makesrna/intern/rna_space.c
M source/blender/modifiers/intern/MOD_fluidsim.c
M source/blender/modifiers/intern/MOD_normal_edit.c
M source/blender/python/intern/bpy_operator.c
M source/blender/python/intern/bpy_rna.c
M source/blender/render/intern/source/convertblender.c
M source/blender/windowmanager/intern/wm_operators.c
M source/gameengine/Ketsji/KX_SteeringActuator.cpp
M source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp
===================================================================
diff --git a/CMakeLists.txt b/CMakeLists.txt
index b52dd05..6bd589d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -663,7 +663,6 @@ if(WITH_GHOST_SDL OR WITH_HEADLESS)
set(WITH_X11_XINPUT OFF)
set(WITH_X11_XF86VMODE OFF)
set(WITH_GHOST_XDND OFF)
- set(WITH_INPUT_IME OFF)
endif()
if(WITH_CPU_SSE)
diff --git a/GNUmakefile b/GNUmakefile
index 2f983be..775d0ae 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -171,7 +171,7 @@ help: FORCE
@echo ""
@echo "Package Targets"
@echo " * package_debian - build a debian package"
- @echo " * package_pacman - build an arch linux pacman package"
+ @echo " * package_pacman - build an arch linux pacmanpackage"
@echo " * package_archive - build an archive package"
@echo ""
@echo "Testing Targets (not associated with building blender)"
@@ -218,7 +218,7 @@ package_debian: FORCE
cd build_files/package_spec ; DEB_BUILD_OPTIONS="parallel=$(NPROCS)" sh ./build_debian.sh
package_pacman: FORCE
- cd build_files/package_spec/pacman ; MAKEFLAGS="-j$(NPROCS)" makepkg
+ cd build_files/package_spec/pacman ; MAKEFLAGS="-j$(NPROCS)" makepkg --asroot
package_archive: FORCE
make -C "$(BUILD_DIR)" -s package_archive
diff --git a/build_files/buildbot/slave_test.py b/build_files/buildbot/slave_test.py
index c4db0d8..2f233fd 100644
--- a/build_files/buildbot/slave_test.py
+++ b/build_files/buildbot/slave_test.py
@@ -33,8 +33,8 @@ blender_dir = '../blender.git'
if "cmake" in builder:
# cmake
- # retcode = subprocess.call(['ctest', '.' '--output-on-failure'])
- # sys.exit(retcode)
+ #~ retcode = subprocess.call(['ctest', '.' '--output-on-failure'])
+ #~ sys.exit(retcode)
pass
else:
# scons
diff --git a/build_files/package_spec/pacman/PKGBUILD b/build_files/package_spec/pacman/PKGBUILD
index 961e355..cc5198a 100644
--- a/build_files/package_spec/pacman/PKGBUILD
+++ b/build_files/package_spec/pacman/PKGBUILD
@@ -12,9 +12,9 @@ blender_version_char=$(sed -ne 's/.*BLENDER_VERSION_CHAR.*\([a-z]\)$/\1/p' $blen
# map the version a -> 1
# not to be confused with blender's internal subversions
if [ "$blender_version_char" ]; then
- blender_version_full=${blender_version}.$(expr index abcdefghijklmnopqrstuvwxyz $blender_version_char)
+ blender_version_full=${blender_version}.$(expr index abcdefghijklmnopqrstuvwxyz $blender_version_char)
else
- blender_version_full=${blender_version}
+ blender_version_full=${blender_version}
fi
blender_ver_string=$blender_version+git$blender_version_full
@@ -60,7 +60,7 @@ package() {
cd $srcdir/build
make DESTDIR="$pkgdir" install
python -m compileall \
- $pkgdir/usr/share/blender/$blender_version/scripts/startup \
- $pkgdir/usr/share/blender/$blender_version/scripts/modules \
- $pkgdir/usr/share/blender/$blender_version/scripts/addons
+ $pkgdir/usr/share/blender/$blender_version/scripts/startup \
+ $pkgdir/usr/share/blender/$blender_version/scripts/modules \
+ $pkgdir/usr/share/blender/$blender_version/scripts/addons
}
diff --git a/extern/libmv/libmv/multiview/homography.cc b/extern/libmv/libmv/multiview/homography.cc
index 346acb3..a7679c3 100644
--- a/extern/libmv/libmv/multiview/homography.cc
+++ b/extern/libmv/libmv/multiview/homography.cc
@@ -179,12 +179,8 @@ void GetNormalizedPoints(const Mat &original_points,
class HomographySymmetricGeometricCostFunctor {
public:
HomographySymmetricGeometricCostFunctor(const Vec2 &x,
- const Vec2 &y) {
- xx_ = x(0);
- xy_ = x(1);
- yx_ = y(0);
- yy_ = y(1);
- }
+ const Vec2 &y)
+ : x_(x), y_(y) { }
template<typename T>
bool operator()(const T *homography_parameters, T *residuals) const {
@@ -193,8 +189,8 @@ class HomographySymmetricGeometricCostFunctor {
Mat3 H(homography_parameters);
- Vec3 x(T(xx_), T(xy_), T(1.0));
- Vec3 y(T(yx_), T(yy_), T(1.0));
+ Vec3 x(T(x_(0)), T(x_(1)), T(1.0));
+ Vec3 y(T(y_(0)), T(y_(1)), T(1.0));
Vec3 H_x = H * x;
Vec3 Hinv_y = H.inverse() * y;
@@ -203,19 +199,18 @@ class HomographySymmetricGeometricCostFunctor {
Hinv_y /= Hinv_y(2);
// This is a forward error.
- residuals[0] = H_x(0) - T(yx_);
- residuals[1] = H_x(1) - T(yy_);
+ residuals[0] = H_x(0) - T(y_(0));
+ residuals[1] = H_x(1) - T(y_(1));
// This is a backward error.
- residuals[2] = Hinv_y(0) - T(xx_);
- residuals[3] = Hinv_y(1) - T(xy_);
+ residuals[2] = Hinv_y(0) - T(x_(0));
+ residuals[3] = Hinv_y(1) - T(x_(1));
return true;
}
- // TODO(sergey): Think of better naming.
- double xx_, xy_;
- double yx_, yy_;
+ const Vec2 &x_;
+ const Vec2 &y_;
};
// Termination checking callback used for homography estimation.
diff --git a/intern/audaspace/intern/AUD_AnimateableProperty.cpp b/intern/audaspace/intern/AUD_AnimateableProperty.cpp
index e0bc18e..9f399a0 100644
--- a/intern/audaspace/intern/AUD_AnimateableProperty.cpp
+++ b/intern/audaspace/intern/AUD_AnimateableProperty.cpp
@@ -119,11 +119,13 @@ void AUD_AnimateableProperty::write(const float* data, int position, int count)
{
m_unknown.push_back(Unknown(pos, position - 1));
- // if the buffer was not animated before, we copy the previous static value
if(pos == 0)
- pos = 1;
-
- updateUnknownCache(pos, position - 1);
+ {
+ for(int i = 0; i < position; i++)
+ memcpy(buf + i * m_count, data, m_count * sizeof(float));
+ }
+ else
+ updateUnknownCache(pos, position - 1);
}
// otherwise it's not at the end, let's check if some unknown part got filled
else
diff --git a/intern/cycles/blender/addon/version_update.py b/intern/cycles/blender/addon/version_update.py
index 2fbb01b..741c201 100644
--- a/intern/cycles/blender/addon/version_update.py
+++ b/intern/cycles/blender/addon/version_update.py
@@ -21,8 +21,10 @@ import bpy
from bpy.app.handlers import persistent
-def check_is_new_shading_ntree(node_tree):
- for node in node_tree.nodes:
+def check_is_new_shading_material(material):
+ if not material.node_tree:
+ return False
+ for node in material.node_tree.nodes:
# If material has any node with ONLY new shading system
# compatibility then it's considered a Cycles material
# and versioning code would need to perform on it.
@@ -42,24 +44,6 @@ def check_is_new_shading_ntree(node_tree):
return False
-def check_is_new_shading_material(material):
- if not material.node_tree:
- return False
- return check_is_new_shading_ntree(material.node_tree)
-
-
-def check_is_new_shading_world(world):
- if not world.node_tree:
- return False
- return check_is_new_shading_ntree(world.node_tree)
-
-
-def check_is_new_shading_lamp(lamp):
- if not lamp.node_tree:
- return False
- return check_is_new_shading_ntree(lamp.node_tree)
-
-
def foreach_notree_node(nodetree, callback, traversed):
if nodetree in traversed:
return
@@ -77,16 +61,6 @@ def foreach_cycles_node(callback):
foreach_notree_node(material.node_tree,
callback,
traversed)
- for world in bpy.data.worlds:
- if check_is_new_shading_world(world):
- foreach_notree_node(world.node_tree,
- callback,
- traversed)
- for lamp in bpy.data.lamps:
- if check_is_new_shading_world(lamp):
- foreach_notree_node(lamp.node_tree,
- callback,
- traversed)
def mapping_node_order_flip(node):
diff --git a/intern/cycles/bvh/bvh_build.cpp b/intern/cycles/bvh/bvh_build.cpp
index f9a761b..4ce8f78 100644
--- a/intern/cycles/bvh/bvh_build.cpp
+++ b/intern/cycles/bvh/bvh_build.cpp
@@ -577,22 +577,17 @@ BVHNode* BVHBuild::create_leaf_node(const BVHRange& range)
return new InnerNode(range.bounds(), leaves[0], leaves[1]);
}
else if(num_leaves == 3) {
- BoundBox inner_bounds = merge(leaves[1]->m_bounds, leaves[2]->m_bounds);
+ BoundBox inner_bounds = merge(bounds[1], bounds[2]);
BVHNode *inner = new InnerNode(inner_bounds, leaves[1], leaves[2]);
return new InnerNode(range.bounds(), leaves[0], inner);
- } else {
+ } else /*if(num_leaves == 4)*/ {
/* Shpuld be doing more branches if more primitive types added. */
- assert(num_leaves <= 5);
- BoundBox inner_bounds_a = merge(leaves[0]->m_bounds, leaves[1]->m_bounds);
- BoundBox inner_bounds_b = merge(leaves[2]->m_bounds, leaves[3]->m_bounds);
+ assert(num_leaves == 4);
+ BoundBox inner_bounds_a = merge(bounds[0], bounds[1]);
+ BoundBox inner_bounds_b = merge(bounds[2], bounds[3]);
BVHNode *inner_a = new InnerNode(inner_bounds_a, leaves[0], leaves[1]);
BVHNode *inner_b = new InnerNode(inner_bounds_b, leaves[2], leaves[3]);
- BoundBox inner_bounds_c = merge(inner_a->m_bounds, inner_b->m_bounds);
- BVHNode *inner_c = new InnerNode(inner_bounds_c, inner_a, inner_b);
- if(num_leaves == 5) {
- return new InnerNode(range.bounds(), inner_c, leaves[4]);
- }
- return inner_c;
+ return new InnerNode(range.bounds(), inner_a, inner_b);
}
}
diff --git a/intern/cycles/bvh/bvh_params.h b/intern/cycles/bvh/bvh_params.h
index af8d8ee..99bfd94 100644
--- a/intern/cycles/bvh/bvh_params.h
+++ b/intern/cycles/bvh/bvh_params.h
@@ -113,9 +113,7 @@ public:
__forceinline int prim_type() const { return type; }
BVHReference& operator=(const BVHReference &arg) {
- if(&arg != this) {
- memcpy(this, &arg, sizeof(BVHReference));
- }
+ memcpy(this, &arg, sizeof(BVHReference));
return *this;
}
diff --git a/intern/cycles/kernel/closure/bsdf_diffuse_ramp.h b/intern/cycles/kernel/closure/bsdf_diffuse_ramp.h
index e0287e7..cdaf84f 100644
--- a/intern/cycles/kernel/closure/bsdf_diffuse_ramp.h
+++ b/intern/cycles/kernel/closure/bsdf_diffuse_ramp.h
@@ -52,8 +52,6 @@ ccl_device float3 bsdf_diffuse_ramp_get_color(const ShaderClosure *sc, const flo
ccl_device int bsdf_diffuse_ramp_setup(ShaderClosure *sc)
{
sc->type = CLOSURE_BSDF_DIFFUSE_RAMP_ID;
- sc->data0 = 0.0f;
- sc->data1 = 0.0f;
return SD_BSDF|SD_BSDF_HAS_EVAL;
}
diff --git a/inter
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list