[Bf-blender-cvs] [bd1ff201b1d] master: Buildfix for 078e034 missing include
Commit: bd1ff201b1dfb7bd382ed19079bcebddfc5e30d4
Author: Jens Verwiebe
Date: Thu Oct 20 21:06:44 2022 +0200
Branches: master
https://developer.blender.org/rBbd1ff201b1dfb7bd382ed19079bcebddfc5e30d4
Buildfix for 078e034 missing include
===
M
source/blender/nodes/geometry/nodes/node_geo_distribute_points_in_volume.cc
===
diff --git
a/source/blender/nodes/geometry/nodes/node_geo_distribute_points_in_volume.cc
b/source/blender/nodes/geometry/nodes/node_geo_distribute_points_in_volume.cc
index 3a021bfe2d7..95173bd23a5 100644
---
a/source/blender/nodes/geometry/nodes/node_geo_distribute_points_in_volume.cc
+++
b/source/blender/nodes/geometry/nodes/node_geo_distribute_points_in_volume.cc
@@ -15,6 +15,8 @@
#include "UI_interface.h"
#include "UI_resources.h"
+#include "DEG_depsgraph_query.h"
+
#include "node_geometry_util.hh"
namespace blender::nodes {
___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
List details, subscription details or unsubscribe:
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] [6b53e0adbc5] master: Better fix for crash ( with gpu only ) on render end/abort introduced in 0dced1a
Commit: 6b53e0adbc5fee508da580bdb8feb596e36751bc
Author: Jens Verwiebe
Date: Thu Jun 25 11:06:56 2020 +0200
Branches: master
https://developer.blender.org/rB6b53e0adbc5fee508da580bdb8feb596e36751bc
Better fix for crash ( with gpu only ) on render end/abort introduced in 0dced1a
===
M intern/cycles/render/geometry.cpp
===
diff --git a/intern/cycles/render/geometry.cpp
b/intern/cycles/render/geometry.cpp
index 291905ac60d..3e18661ecf7 100644
--- a/intern/cycles/render/geometry.cpp
+++ b/intern/cycles/render/geometry.cpp
@@ -1409,12 +1409,11 @@ void GeometryManager::device_update(Device *device,
void GeometryManager::device_free(Device *device, DeviceScene *dscene)
{
#ifdef WITH_EMBREE
- if (dscene->data.bvh.bvh_layout == BVH_LAYOUT_EMBREE) {
-if (dscene->data.bvh.scene) {
+ if (dscene->data.bvh.scene) {
+if (dscene->data.bvh.bvh_layout == BVH_LAYOUT_EMBREE)
BVHEmbree::destroy(dscene->data.bvh.scene);
- dscene->data.bvh.scene = NULL;
+dscene->data.bvh.scene = NULL;
}
- }
#endif
dscene->bvh_nodes.free();
___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] [ec776f18ff7] master: Fix crashing on render end/abort introduced in 0dced1a
Commit: ec776f18ff70348fd2b13c70e54843f2ba45b599
Author: Jens Verwiebe
Date: Wed Jun 24 23:51:57 2020 +0200
Branches: master
https://developer.blender.org/rBec776f18ff70348fd2b13c70e54843f2ba45b599
Fix crashing on render end/abort introduced in 0dced1a
===
M intern/cycles/render/geometry.cpp
===
diff --git a/intern/cycles/render/geometry.cpp
b/intern/cycles/render/geometry.cpp
index 9da1c083ba2..291905ac60d 100644
--- a/intern/cycles/render/geometry.cpp
+++ b/intern/cycles/render/geometry.cpp
@@ -1409,9 +1409,11 @@ void GeometryManager::device_update(Device *device,
void GeometryManager::device_free(Device *device, DeviceScene *dscene)
{
#ifdef WITH_EMBREE
- if (dscene->data.bvh.scene) {
-BVHEmbree::destroy(dscene->data.bvh.scene);
-dscene->data.bvh.scene = NULL;
+ if (dscene->data.bvh.bvh_layout == BVH_LAYOUT_EMBREE) {
+if (dscene->data.bvh.scene) {
+ BVHEmbree::destroy(dscene->data.bvh.scene);
+ dscene->data.bvh.scene = NULL;
+}
}
#endif
___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] [839fe335d2d] blender-v2.83-release: Fix crash after 475bd6b occuring on each render end, we need another nullcheck here
Commit: 839fe335d2d6333830fd7236925c01d9db909bda
Author: Jens Verwiebe
Date: Tue Apr 28 23:49:52 2020 +0200
Branches: blender-v2.83-release
https://developer.blender.org/rB839fe335d2d6333830fd7236925c01d9db909bda
Fix crash after 475bd6b occuring on each render end, we need another nullcheck
here
(cherry picked from commit 3ea67e08fe8e3edc73daf13769dd631dbf920c45)
===
M source/blender/editors/space_image/image_buttons.c
===
diff --git a/source/blender/editors/space_image/image_buttons.c
b/source/blender/editors/space_image/image_buttons.c
index fcd6baa9582..6f3ef44fe94 100644
--- a/source/blender/editors/space_image/image_buttons.c
+++ b/source/blender/editors/space_image/image_buttons.c
@@ -656,7 +656,7 @@ static void uiblock_layer_pass_buttons(
/* pass */
rpass = (rl ? BLI_findlink(>passes, iuser->pass) : NULL);
-if (RE_passes_have_name(rl)) {
+if (rl && RE_passes_have_name(rl)) {
display_name = rpass ? rpass->name : "";
rnd_pt = ui_imageuser_data_copy(_pt_local);
but = uiDefMenuBut(block,
___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] [3ea67e08fe8] master: Fix crash after 475bd6b occuring on each render end, we need another nullcheck here
Commit: 3ea67e08fe8e3edc73daf13769dd631dbf920c45
Author: Jens Verwiebe
Date: Tue Apr 28 23:49:52 2020 +0200
Branches: master
https://developer.blender.org/rB3ea67e08fe8e3edc73daf13769dd631dbf920c45
Fix crash after 475bd6b occuring on each render end, we need another nullcheck
here
===
M source/blender/editors/space_image/image_buttons.c
===
diff --git a/source/blender/editors/space_image/image_buttons.c
b/source/blender/editors/space_image/image_buttons.c
index fcd6baa9582..6f3ef44fe94 100644
--- a/source/blender/editors/space_image/image_buttons.c
+++ b/source/blender/editors/space_image/image_buttons.c
@@ -656,7 +656,7 @@ static void uiblock_layer_pass_buttons(
/* pass */
rpass = (rl ? BLI_findlink(>passes, iuser->pass) : NULL);
-if (RE_passes_have_name(rl)) {
+if (rl && RE_passes_have_name(rl)) {
display_name = rpass ? rpass->name : "";
rnd_pt = ui_imageuser_data_copy(_pt_local);
but = uiDefMenuBut(block,
___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] [ddd28bad90b] master: Fix compiling after last commit
Commit: ddd28bad90bdcb06ab5a351e416e3d5c6209fa61
Author: Jens Verwiebe
Date: Fri Mar 15 22:07:09 2019 +0100
Branches: master
https://developer.blender.org/rBddd28bad90bdcb06ab5a351e416e3d5c6209fa61
Fix compiling after last commit
===
M source/blender/editors/space_view3d/view3d_draw_legacy.c
===
diff --git a/source/blender/editors/space_view3d/view3d_draw_legacy.c
b/source/blender/editors/space_view3d/view3d_draw_legacy.c
index eed6fc31235..1f13f308005 100644
--- a/source/blender/editors/space_view3d/view3d_draw_legacy.c
+++ b/source/blender/editors/space_view3d/view3d_draw_legacy.c
@@ -267,7 +267,7 @@ void ED_view3d_backbuf_depth_validate(ViewContext *vc)
draw_object_depth(rv3d, obact_eval);
if (rv3d->rflag & RV3D_CLIPPING) {
- ED_view3d_clipping_disable(rv3d);
+ ED_view3d_clipping_disable();
}
GPU_depth_test(false);
___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] [e5bc9fae54d] master: Fix penpressure for tablets that use libinput on linux
Commit: e5bc9fae54d2906cdc49278ec148343869fede0c
Author: Jens Verwiebe
Date: Sat Nov 24 18:23:57 2018 +0100
Branches: master
https://developer.blender.org/rBe5bc9fae54d2906cdc49278ec148343869fede0c
Fix penpressure for tablets that use libinput on linux
===
M intern/ghost/intern/GHOST_SystemX11.cpp
===
diff --git a/intern/ghost/intern/GHOST_SystemX11.cpp
b/intern/ghost/intern/GHOST_SystemX11.cpp
index c8984f0e280..06754bc9300 100644
--- a/intern/ghost/intern/GHOST_SystemX11.cpp
+++ b/intern/ghost/intern/GHOST_SystemX11.cpp
@@ -2231,6 +2231,7 @@ static BOOL is_stylus(const char *name, const char *type)
"stylus",
"wizardpen",
"acecad",
+ "pen",
NULL
};
@@ -2286,7 +2287,8 @@ void GHOST_SystemX11::refreshXInputDevices()
if ((m_xtablet.StylusDevice == NULL) &&
- (is_stylus(device_info[i].name,
device_type) || (device_info[i].type == m_atom.TABLET)))
+ (is_stylus(device_info[i].name,
device_type) && (device_info[i].type != m_atom.TABLET)))
+ /* for libinput to work reliable, only
lookup ValuatorClass in Tablet type:'STYLUS' */
{
// printf("\tfound stylus\n");
m_xtablet.StylusID = device_info[i].id;
___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] [1c41dbb079e] master: Fix compiling after ui cleanups
Commit: 1c41dbb079e391a1d684a7dedf40728025ef8839 Author: Jens Verwiebe Date: Thu Jul 26 14:21:15 2018 +0200 Branches: master https://developer.blender.org/rB1c41dbb079e391a1d684a7dedf40728025ef8839 Fix compiling after ui cleanups === M source/blender/editors/sound/sound_ops.c === diff --git a/source/blender/editors/sound/sound_ops.c b/source/blender/editors/sound/sound_ops.c index 356a5f8074b..c3ed2a7b9c2 100644 --- a/source/blender/editors/sound/sound_ops.c +++ b/source/blender/editors/sound/sound_ops.c @@ -634,7 +634,7 @@ static void sound_mixdown_draw(bContext *C, wmOperator *op) RNA_pointer_create(>id, op->type->srna, op->properties, ); /* main draw call */ - uiDefAutoButsRNA(layout, , sound_mixdown_draw_check_prop, '\0'); + uiDefAutoButsRNA(layout, , sound_mixdown_draw_check_prop, NULL, '\0'); } #endif // WITH_AUDASPACE ___ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org https://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] [da4854a8b8b] fracture_modifier: missed in last commit: rise BM_OMPLIMIT to avoid overheads with small datasets
Commit: da4854a8b8b919816aaf2290acd807ad7abd402b Author: Jens Verwiebe Date: Wed May 2 20:45:37 2018 +0200 Branches: fracture_modifier https://developer.blender.org/rBda4854a8b8b919816aaf2290acd807ad7abd402b missed in last commit: rise BM_OMPLIMIT to avoid overheads with small datasets === M source/blender/bmesh/bmesh_class.h === diff --git a/source/blender/bmesh/bmesh_class.h b/source/blender/bmesh/bmesh_class.h index bec2c7a1f45..14c75cf2fbb 100644 --- a/source/blender/bmesh/bmesh_class.h +++ b/source/blender/bmesh/bmesh_class.h @@ -421,7 +421,7 @@ typedef bool (*BMLoopFilterFunc)(const BMLoop *, void *user_data); #ifdef DEBUG # define BM_OMP_LIMIT 0 #else -# define BM_OMP_LIMIT 1 +# define BM_OMP_LIMIT 100 #endif #endif /* __BMESH_CLASS_H__ */ ___ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org https://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] [f3ce2881c3d] fracture_modifier: fix a clang warning, fix an improper initialisation for gcc, remove nonfunctional omp, rise BM_OMPLIMIT to avoid overheads with small datasets
Commit: f3ce2881c3d84fc58b91a98816982598e108c693
Author: Jens Verwiebe
Date: Wed May 2 20:41:56 2018 +0200
Branches: fracture_modifier
https://developer.blender.org/rBf3ce2881c3d84fc58b91a98816982598e108c693
fix a clang warning, fix an improper initialisation for gcc, remove
nonfunctional omp, rise BM_OMPLIMIT to avoid overheads with small datasets
===
M intern/rigidbody/RBI_api.h
M source/blender/blenkernel/intern/rigidbody.c
M source/blender/modifiers/intern/MOD_remesh.c
===
diff --git a/intern/rigidbody/RBI_api.h b/intern/rigidbody/RBI_api.h
index 01d27357676..a73faf4d87c 100644
--- a/intern/rigidbody/RBI_api.h
+++ b/intern/rigidbody/RBI_api.h
@@ -267,7 +267,7 @@ rbCollisionShape *RB_shape_new_gimpact_mesh(rbMeshData
*mesh);
int RB_shape_get_num_verts(rbCollisionShape *shape);
-rbCollisionShape *RB_shape_new_compound();
+rbCollisionShape *RB_shape_new_compound(void);
void RB_shape_add_compound_child(rbCollisionShape** compound,
rbCollisionShape* child, float loc[3], float rot[4]);
/* Cleanup --- */
diff --git a/source/blender/blenkernel/intern/rigidbody.c
b/source/blender/blenkernel/intern/rigidbody.c
index 45255a0f7ac..51db95539b6 100644
--- a/source/blender/blenkernel/intern/rigidbody.c
+++ b/source/blender/blenkernel/intern/rigidbody.c
@@ -1884,7 +1884,7 @@ static void rigidbody_update_sim_ob(Scene *scene,
RigidBodyWorld *rbw, Object *o
/* only dynamic bodies need effector update */
else if (rbo->type == RBO_TYPE_ACTIVE /* && ((ob->pd == NULL) ||
(ob->pd->forcefield == PFIELD_NULL))*/) {
EffectorWeights *effector_weights = rbw->effector_weights;
- EffectedPoint epoint;
+ EffectedPoint epoint = {0};
ListBase *effectors;
/* get effectors present in the group specified by
effector_weights */
diff --git a/source/blender/modifiers/intern/MOD_remesh.c
b/source/blender/modifiers/intern/MOD_remesh.c
index 7843cc1bd3e..173d7d16a74 100644
--- a/source/blender/modifiers/intern/MOD_remesh.c
+++ b/source/blender/modifiers/intern/MOD_remesh.c
@@ -272,7 +272,7 @@ static DerivedMesh *repolygonize(RemeshModifierData *rmd,
Object* ob, DerivedMes
orig_index = CustomData_add_layer(>vertData, CD_ORIGINDEX,
CD_CALLOC, NULL, n);
-#pragma omp parallel for
+//#pragma omp parallel for
for (i = 0; i < n; i++)
{
copy_v3_v3(mv[i].co, pos[i]);
@@ -353,7 +353,7 @@ static DerivedMesh *repolygonize(RemeshModifierData *rmd,
Object* ob, DerivedMes
oqW = CustomData_get_layer_named(>vertData,
CD_PROP_FLT, "quatW");
-#pragma omp parallel for
+//#pragma omp parallel for
for (i = 0; i < n; i++)
{
copy_v3_v3(mv[i].co, pos[i]);
@@ -375,7 +375,7 @@ static DerivedMesh *repolygonize(RemeshModifierData *rmd,
Object* ob, DerivedMes
}
}
-#pragma omp parallel for
+//#pragma omp parallel for
for (i = n; i < n + derived->numVertData; i++)
{
copy_v3_v3(mv[i].co, mv2[i-n].co);
___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] [15dfd866db0] master: Fix Player tm, a lifes job
Commit: 15dfd866db0c06796aabf09afee686a2ce4e1d75 Author: Jens Verwiebe Date: Sun Feb 25 10:35:08 2018 +0100 Branches: master https://developer.blender.org/rB15dfd866db0c06796aabf09afee686a2ce4e1d75 Fix Player tm, a lifes job === M source/blenderplayer/bad_level_call_stubs/stubs.c === diff --git a/source/blenderplayer/bad_level_call_stubs/stubs.c b/source/blenderplayer/bad_level_call_stubs/stubs.c index 85ed589dd78..f7afa5e0f2c 100644 --- a/source/blenderplayer/bad_level_call_stubs/stubs.c +++ b/source/blenderplayer/bad_level_call_stubs/stubs.c @@ -729,7 +729,7 @@ int UI_pie_menu_invoke_from_operator_enum(struct bContext *C, const char *title, /* RNA COLLADA dependency */ /* XXX (gaia) Why do we need this declaration here? */ /* The collada header is included anyways further up... */ -int collada_export(struct Scene *sce, +int collada_export(struct bContext *C, const char *filepath, int apply_modifiers, BC_export_mesh_type export_mesh_type, ___ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org https://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] [0a1434ed866] master: Fix a whitespace slipped in
Commit: 0a1434ed86687c3d7cacef0b2a19ef3326808beb Author: Jens Verwiebe Date: Sat Feb 24 18:07:05 2018 +0100 Branches: master https://developer.blender.org/rB0a1434ed86687c3d7cacef0b2a19ef3326808beb Fix a whitespace slipped in === M source/blenderplayer/bad_level_call_stubs/stubs.c === diff --git a/source/blenderplayer/bad_level_call_stubs/stubs.c b/source/blenderplayer/bad_level_call_stubs/stubs.c index c35ad153fef..85ed589dd78 100644 --- a/source/blenderplayer/bad_level_call_stubs/stubs.c +++ b/source/blenderplayer/bad_level_call_stubs/stubs.c @@ -739,7 +739,7 @@ int collada_export(struct Scene *sce, int include_armatures, int include_shapekeys, int deform_bones_only, - int sampling_rate, + int sampling_rate, int active_uv_only, BC_export_texture_type export_texture_type, ___ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org https://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] [c23b77fe46b] master: Fix Plyer tm
Commit: c23b77fe46bc694deb708a7cd2266a3a871c3054 Author: Jens Verwiebe Date: Sat Feb 24 17:30:37 2018 +0100 Branches: master https://developer.blender.org/rBc23b77fe46bc694deb708a7cd2266a3a871c3054 Fix Plyer tm === M source/blenderplayer/bad_level_call_stubs/stubs.c === diff --git a/source/blenderplayer/bad_level_call_stubs/stubs.c b/source/blenderplayer/bad_level_call_stubs/stubs.c index 9728511e2cf..c35ad153fef 100644 --- a/source/blenderplayer/bad_level_call_stubs/stubs.c +++ b/source/blenderplayer/bad_level_call_stubs/stubs.c @@ -739,6 +739,7 @@ int collada_export(struct Scene *sce, int include_armatures, int include_shapekeys, int deform_bones_only, + int sampling_rate, int active_uv_only, BC_export_texture_type export_texture_type, ___ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org https://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] [ea82f4ce4e6] fracture_modifier: fix an ffmpeg qtrle crasher
Commit: ea82f4ce4e614a4707cae0733df8d03e4d031584
Author: Jens Verwiebe
Date: Sun Feb 4 22:21:20 2018 +0100
Branches: fracture_modifier
https://developer.blender.org/rBea82f4ce4e614a4707cae0733df8d03e4d031584
fix an ffmpeg qtrle crasher
===
M source/blender/blenkernel/intern/writeffmpeg.c
===
diff --git a/source/blender/blenkernel/intern/writeffmpeg.c
b/source/blender/blenkernel/intern/writeffmpeg.c
index 156b74f5c3d..e8886ae96ea 100644
--- a/source/blender/blenkernel/intern/writeffmpeg.c
+++ b/source/blender/blenkernel/intern/writeffmpeg.c
@@ -648,9 +648,9 @@ static AVStream *alloc_video_stream(FFMpegContext *context,
RenderData *rd, int
}
if (codec_id == AV_CODEC_ID_QTRLE) {
- if (rd->im_format.planes == R_IMF_PLANES_RGBA) {
+// if (rd->im_format.planes == R_IMF_PLANES_RGBA) {
c->pix_fmt = AV_PIX_FMT_ARGB;
- }
+// }
}
if (codec_id == AV_CODEC_ID_PNG) {
___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] [1431d9a5457] temp_cryptomatte: Revert moving includes to fix linux linking and just change linkorder again
Commit: 1431d9a5457cbbcb01c4e9254673aeb9799eb051
Author: Jens Verwiebe
Date: Mon Nov 6 17:32:30 2017 +0100
Branches: temp_cryptomatte
https://developer.blender.org/rB1431d9a5457cbbcb01c4e9254673aeb9799eb051
Revert moving includes to fix linux linking and just change linkorder again
===
M build_files/cmake/macros.cmake
M intern/cycles/device/CMakeLists.txt
M intern/cycles/render/CMakeLists.txt
===
diff --git a/build_files/cmake/macros.cmake b/build_files/cmake/macros.cmake
index 6998595a6fc..1630ff3d973 100644
--- a/build_files/cmake/macros.cmake
+++ b/build_files/cmake/macros.cmake
@@ -651,10 +651,10 @@ function(SETUP_BLENDER_SORTED_LIBS)
bf_intern_mikktspace
bf_intern_dualcon
bf_intern_cycles
+ cycles_device
cycles_render
cycles_graph
cycles_bvh
- cycles_device
cycles_kernel
cycles_util
cycles_subd
diff --git a/intern/cycles/device/CMakeLists.txt
b/intern/cycles/device/CMakeLists.txt
index 30b0e7a0da0..959c0aa97c9 100644
--- a/intern/cycles/device/CMakeLists.txt
+++ b/intern/cycles/device/CMakeLists.txt
@@ -31,7 +31,6 @@ set(SRC
device_opencl.cpp
device_split_kernel.cpp
device_task.cpp
- ../render/coverage.cpp
)
set(SRC_OPENCL
@@ -59,7 +58,6 @@ set(SRC_HEADERS
device_network.h
device_split_kernel.h
device_task.h
- ../render/coverage.h
)
add_definitions(${GL_DEFINITIONS})
diff --git a/intern/cycles/render/CMakeLists.txt
b/intern/cycles/render/CMakeLists.txt
index 17ac66644e2..ce2344b9c35 100644
--- a/intern/cycles/render/CMakeLists.txt
+++ b/intern/cycles/render/CMakeLists.txt
@@ -15,6 +15,7 @@ set(SRC
buffers.cpp
camera.cpp
constant_fold.cpp
+ coverage.cpp
film.cpp
graph.cpp
image.cpp
@@ -44,6 +45,7 @@ set(SRC_HEADERS
buffers.h
camera.h
constant_fold.h
+ coverage.h
film.h
graph.h
image.h
___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] [bd081133bed] temp_cryptomatte: Build coverage into cyles_device to fix linux linking finally, TODO: move files eventually
Commit: bd081133bed9bca12fb6db74b55c8bf7a8a9ee75
Author: Jens Verwiebe
Date: Sat Nov 4 17:36:00 2017 +0100
Branches: temp_cryptomatte
https://developer.blender.org/rBbd081133bed9bca12fb6db74b55c8bf7a8a9ee75
Build coverage into cyles_device to fix linux linking finally, TODO: move files
eventually
===
M build_files/cmake/macros.cmake
M intern/cycles/device/CMakeLists.txt
M intern/cycles/render/CMakeLists.txt
===
diff --git a/build_files/cmake/macros.cmake b/build_files/cmake/macros.cmake
index c3842ef5426..6998595a6fc 100644
--- a/build_files/cmake/macros.cmake
+++ b/build_files/cmake/macros.cmake
@@ -668,11 +668,6 @@ function(SETUP_BLENDER_SORTED_LIBS)
bf_intern_glew_mx
)
- # tenative fix for linux missing flatten_coverage symbol cause of
contradictionary ordering
- if(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
- list(APPEND BLENDER_SORTED_LIBS cycles_render)
- endif()
-
if(NOT WITH_SYSTEM_GLOG)
list(APPEND BLENDER_SORTED_LIBS extern_glog)
endif()
diff --git a/intern/cycles/device/CMakeLists.txt
b/intern/cycles/device/CMakeLists.txt
index 959c0aa97c9..30b0e7a0da0 100644
--- a/intern/cycles/device/CMakeLists.txt
+++ b/intern/cycles/device/CMakeLists.txt
@@ -31,6 +31,7 @@ set(SRC
device_opencl.cpp
device_split_kernel.cpp
device_task.cpp
+ ../render/coverage.cpp
)
set(SRC_OPENCL
@@ -58,6 +59,7 @@ set(SRC_HEADERS
device_network.h
device_split_kernel.h
device_task.h
+ ../render/coverage.h
)
add_definitions(${GL_DEFINITIONS})
diff --git a/intern/cycles/render/CMakeLists.txt
b/intern/cycles/render/CMakeLists.txt
index ce2344b9c35..17ac66644e2 100644
--- a/intern/cycles/render/CMakeLists.txt
+++ b/intern/cycles/render/CMakeLists.txt
@@ -15,7 +15,6 @@ set(SRC
buffers.cpp
camera.cpp
constant_fold.cpp
- coverage.cpp
film.cpp
graph.cpp
image.cpp
@@ -45,7 +44,6 @@ set(SRC_HEADERS
buffers.h
camera.h
constant_fold.h
- coverage.h
film.h
graph.h
image.h
___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] [99f5b9f900e] temp_cryptomatte: Tentative fix for linux linking
Commit: 99f5b9f900e46c5b888ff368feba655167be5a05
Author: Jens Verwiebe
Date: Sat Nov 4 16:46:42 2017 +0100
Branches: temp_cryptomatte
https://developer.blender.org/rB99f5b9f900e46c5b888ff368feba655167be5a05
Tentative fix for linux linking
===
M build_files/cmake/macros.cmake
===
diff --git a/build_files/cmake/macros.cmake b/build_files/cmake/macros.cmake
index 6998595a6fc..c3842ef5426 100644
--- a/build_files/cmake/macros.cmake
+++ b/build_files/cmake/macros.cmake
@@ -668,6 +668,11 @@ function(SETUP_BLENDER_SORTED_LIBS)
bf_intern_glew_mx
)
+ # tenative fix for linux missing flatten_coverage symbol cause of
contradictionary ordering
+ if(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
+ list(APPEND BLENDER_SORTED_LIBS cycles_render)
+ endif()
+
if(NOT WITH_SYSTEM_GLOG)
list(APPEND BLENDER_SORTED_LIBS extern_glog)
endif()
___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] [87a976361c4] temp_cryptomatte: Fix Blenderplayer (tm)
Commit: 87a976361c4ead83d0274f3bbe9bd8cbe80ca8cf Author: Jens Verwiebe Date: Fri Nov 3 23:41:52 2017 +0100 Branches: temp_cryptomatte https://developer.blender.org/rB87a976361c4ead83d0274f3bbe9bd8cbe80ca8cf Fix Blenderplayer (tm) === M source/blenderplayer/bad_level_call_stubs/stubs.c === diff --git a/source/blenderplayer/bad_level_call_stubs/stubs.c b/source/blenderplayer/bad_level_call_stubs/stubs.c index 4bfc8697b22..957af8607ec 100644 --- a/source/blenderplayer/bad_level_call_stubs/stubs.c +++ b/source/blenderplayer/bad_level_call_stubs/stubs.c @@ -658,7 +658,7 @@ struct RenderData *RE_engine_get_render_data(struct Render *re) RET_NULL void RE_engine_update_result(struct RenderEngine *engine, struct RenderResult *result) RET_NONE void RE_engine_update_progress(struct RenderEngine *engine, float progress) RET_NONE void RE_engine_set_error_message(RenderEngine *engine, const char *msg) RET_NONE -void RE_engine_add_pass(RenderEngine *engine, const char *name, int channels, const char *chan_id, const char *layername) RET_NONE +void RE_engine_add_pass(RenderEngine *engine, const char *name, int channels, const char *chan_id, const char *layername, int pixel_type) RET_NONE void RE_engine_end_result(RenderEngine *engine, struct RenderResult *result, int cancel, int highlight, int merge_results) RET_NONE void RE_engine_update_stats(RenderEngine *engine, const char *stats, const char *info) RET_NONE void RE_layer_load_from_file(struct RenderLayer *layer, struct ReportList *reports, const char *filename, int x, int y) RET_NONE ___ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org https://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] [fbb9b70484e] master: Fix Blenderplayer (tm)
Commit: fbb9b70484e26c513fb10c1fb16607b019f822bd Author: Jens Verwiebe Date: Fri Nov 3 00:39:50 2017 +0100 Branches: master https://developer.blender.org/rBfbb9b70484e26c513fb10c1fb16607b019f822bd Fix Blenderplayer (tm) === M source/blenderplayer/bad_level_call_stubs/stubs.c === diff --git a/source/blenderplayer/bad_level_call_stubs/stubs.c b/source/blenderplayer/bad_level_call_stubs/stubs.c index 25f095f7ab6..4bfc8697b22 100644 --- a/source/blenderplayer/bad_level_call_stubs/stubs.c +++ b/source/blenderplayer/bad_level_call_stubs/stubs.c @@ -572,6 +572,7 @@ void uiItemR(uiLayout *layout, struct PointerRNA *ptr, const char *propname, int void uiItemFullO(uiLayout *layout, const char *idname, const char *name, int icon, struct IDProperty *properties, int context, int flag, struct PointerRNA *r_opptr) RET_NONE void uiItemFullO_ptr(struct uiLayout *layout, struct wmOperatorType *ot, const char *name, int icon, struct IDProperty *properties, int context, int flag, struct PointerRNA *r_opptr) RET_NONE +void uiItemFullOMenuHold_ptr( uiLayout *layout, struct wmOperatorType *ot, const char *name, int icon, struct IDProperty *properties, int context, int flag, const char *menu_id, /* extra menu arg. */ PointerRNA *r_opptr) RET_NONE struct uiLayout *uiLayoutRow(uiLayout *layout, int align) RET_NULL struct uiLayout *uiLayoutColumn(uiLayout *layout, int align) RET_NULL struct uiLayout *uiLayoutColumnFlow(uiLayout *layout, int number, int align) RET_NULL ___ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org https://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] [98ab2c682da] master: Fix denoiser tooltip
Commit: 98ab2c682da18fd9f9de32285cec60a0062d7138 Author: Jens Verwiebe Date: Tue May 9 14:44:59 2017 +0200 Branches: master https://developer.blender.org/rB98ab2c682da18fd9f9de32285cec60a0062d7138 Fix denoiser tooltip === M intern/cycles/blender/addon/properties.py === diff --git a/intern/cycles/blender/addon/properties.py b/intern/cycles/blender/addon/properties.py index 2ac1a1aacdf..70f704894bb 100644 --- a/intern/cycles/blender/addon/properties.py +++ b/intern/cycles/blender/addon/properties.py @@ -1260,7 +1260,7 @@ class CyclesRenderLayerSettings(bpy.types.PropertyGroup): ) cls.denoising_relative_pca = BoolProperty( name="Relative filter", -description="When removing that don't carry information, use a relative threshold instead of an absolute one (can help to reduce artifacts, but might cause detail loss around edges)", +description="When removing pixels that don't carry information, use a relative threshold instead of an absolute one (can help to reduce artifacts, but might cause detail loss around edges)", default=False, ) cls.denoising_store_passes = BoolProperty( ___ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org https://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] SVN commit: /data/svn/repos/bf-blender [61869] trunk/lib/darwin-9.x.universal/alembic: darwin9: add alembic binaries and fix small quirck in libalembic
Revision: 61869 https://developer.blender.org/rBL61869 Author: jensverwiebe Date: 2017-04-28 20:16:04 +0200 (Fri, 28 Apr 2017) Log Message: --- darwin9: add alembic binaries and fix small quirck in libalembic Modified Paths: -- trunk/lib/darwin-9.x.universal/alembic/lib/libAlembic.a Added Paths: --- trunk/lib/darwin-9.x.universal/alembic/bin/ trunk/lib/darwin-9.x.universal/alembic/bin/abcdiff trunk/lib/darwin-9.x.universal/alembic/bin/abcecho trunk/lib/darwin-9.x.universal/alembic/bin/abcechobounds trunk/lib/darwin-9.x.universal/alembic/bin/abcls trunk/lib/darwin-9.x.universal/alembic/bin/abcstitcher trunk/lib/darwin-9.x.universal/alembic/bin/abctree Added: trunk/lib/darwin-9.x.universal/alembic/bin/abcdiff === (Binary files differ) Index: trunk/lib/darwin-9.x.universal/alembic/bin/abcdiff === --- trunk/lib/darwin-9.x.universal/alembic/bin/abcdiff 2017-04-27 15:54:00 UTC (rev 61868) +++ trunk/lib/darwin-9.x.universal/alembic/bin/abcdiff 2017-04-28 18:16:04 UTC (rev 61869) Property changes on: trunk/lib/darwin-9.x.universal/alembic/bin/abcdiff ___ Added: svn:executable ## -0,0 +1 ## +* \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: trunk/lib/darwin-9.x.universal/alembic/bin/abcecho === (Binary files differ) Index: trunk/lib/darwin-9.x.universal/alembic/bin/abcecho === --- trunk/lib/darwin-9.x.universal/alembic/bin/abcecho 2017-04-27 15:54:00 UTC (rev 61868) +++ trunk/lib/darwin-9.x.universal/alembic/bin/abcecho 2017-04-28 18:16:04 UTC (rev 61869) Property changes on: trunk/lib/darwin-9.x.universal/alembic/bin/abcecho ___ Added: svn:executable ## -0,0 +1 ## +* \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: trunk/lib/darwin-9.x.universal/alembic/bin/abcechobounds === (Binary files differ) Index: trunk/lib/darwin-9.x.universal/alembic/bin/abcechobounds === --- trunk/lib/darwin-9.x.universal/alembic/bin/abcechobounds2017-04-27 15:54:00 UTC (rev 61868) +++ trunk/lib/darwin-9.x.universal/alembic/bin/abcechobounds2017-04-28 18:16:04 UTC (rev 61869) Property changes on: trunk/lib/darwin-9.x.universal/alembic/bin/abcechobounds ___ Added: svn:executable ## -0,0 +1 ## +* \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: trunk/lib/darwin-9.x.universal/alembic/bin/abcls === (Binary files differ) Index: trunk/lib/darwin-9.x.universal/alembic/bin/abcls === --- trunk/lib/darwin-9.x.universal/alembic/bin/abcls2017-04-27 15:54:00 UTC (rev 61868) +++ trunk/lib/darwin-9.x.universal/alembic/bin/abcls2017-04-28 18:16:04 UTC (rev 61869) Property changes on: trunk/lib/darwin-9.x.universal/alembic/bin/abcls ___ Added: svn:executable ## -0,0 +1 ## +* \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: trunk/lib/darwin-9.x.universal/alembic/bin/abcstitcher === (Binary files differ) Index: trunk/lib/darwin-9.x.universal/alembic/bin/abcstitcher === --- trunk/lib/darwin-9.x.universal/alembic/bin/abcstitcher 2017-04-27 15:54:00 UTC (rev 61868) +++ trunk/lib/darwin-9.x.universal/alembic/bin/abcstitcher 2017-04-28 18:16:04 UTC (rev 61869) Property changes on: trunk/lib/darwin-9.x.universal/alembic/bin/abcstitcher ___ Added: svn:executable ## -0,0 +1 ## +* \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: trunk/lib/darwin-9.x.universal/alembic/bin/abctree === (Binary files differ) Index: trunk/lib/darwin-9.x.universal/alembic/bin/abctree === --- trunk/lib/darwin-9.x.universal/alembic/bin/abctree 2017-04-27 15:54:00 UTC (rev 61868) +++
[Bf-blender-cvs] SVN commit: /data/svn/repos/bf-blender [61863] trunk/lib/darwin-9.x.universal/opencolorio: OSX: update ocio to 1.0.9
Revision: 61863
https://developer.blender.org/rBL61863
Author: jensverwiebe
Date: 2017-04-26 20:43:02 +0200 (Wed, 26 Apr 2017)
Log Message:
---
OSX: update ocio to 1.0.9
Modified Paths:
--
trunk/lib/darwin-9.x.universal/opencolorio/include/OpenColorIO/OpenColorABI.h
trunk/lib/darwin-9.x.universal/opencolorio/include/OpenColorIO/OpenColorIO.h
trunk/lib/darwin-9.x.universal/opencolorio/include/OpenColorIO/OpenColorTypes.h
trunk/lib/darwin-9.x.universal/opencolorio/lib/libOpenColorIO.a
trunk/lib/darwin-9.x.universal/opencolorio/lib/libtinyxml.a
trunk/lib/darwin-9.x.universal/opencolorio/lib/libyaml-cpp.a
Modified:
trunk/lib/darwin-9.x.universal/opencolorio/include/OpenColorIO/OpenColorABI.h
===
---
trunk/lib/darwin-9.x.universal/opencolorio/include/OpenColorIO/OpenColorABI.h
2017-04-26 15:44:39 UTC (rev 61862)
+++
trunk/lib/darwin-9.x.universal/opencolorio/include/OpenColorIO/OpenColorABI.h
2017-04-26 18:43:02 UTC (rev 61863)
@@ -32,7 +32,7 @@
// Makefile configuration options
#define OCIO_NAMESPACE OpenColorIO
#define OCIO_USE_BOOST_PTR 0
-#define OCIO_VERSION "1.0.7"
+#define OCIO_VERSION "1.0.9"
#define OCIO_VERSION_NS v1
/* Version as a single 4-byte hex number, e.g. 0x01050200 == 1.5.2
@@ -42,7 +42,7 @@
*/
#define OCIO_VERSION_HEX ((1 << 24) | \
(0 << 16) | \
- (7 << 8))
+ (9 << 8))
// Namespace / version mojo
@@ -65,7 +65,7 @@
// If supported, define OCIOEXPORT, OCIOHIDDEN
// (used to choose which symbols to export from OpenColorIO)
-#if defined __linux__ || __APPLE__
+#if defined __linux__ || __APPLE__ || __FreeBSD__
#if __GNUC__ >= 4
#define OCIOEXPORT __attribute__ ((visibility("default")))
#define OCIOHIDDEN __attribute__ ((visibility("hidden")))
Modified:
trunk/lib/darwin-9.x.universal/opencolorio/include/OpenColorIO/OpenColorIO.h
===
---
trunk/lib/darwin-9.x.universal/opencolorio/include/OpenColorIO/OpenColorIO.h
2017-04-26 15:44:39 UTC (rev 61862)
+++
trunk/lib/darwin-9.x.universal/opencolorio/include/OpenColorIO/OpenColorIO.h
2017-04-26 18:43:02 UTC (rev 61863)
@@ -270,11 +270,24 @@
ConstContextRcPtr getCurrentContext() const;
//!cpp:function::
+void addEnvironmentVar(const char * name, const char * defaultValue);
+//!cpp:function::
+int getNumEnvironmentVars() const;
+//!cpp:function::
+const char * getEnvironmentVarNameByIndex(int index) const;
+//!cpp:function::
+const char * getEnvironmentVarDefault(const char * name) const;
+//!cpp:function::
+void clearEnvironmentVars();
+
+//!cpp:function::
const char * getSearchPath() const;
+//!cpp:function::
void setSearchPath(const char * path);
//!cpp:function::
const char * getWorkingDir() const;
+//!cpp:function::
void setWorkingDir(const char * dirname);
///
@@ -933,6 +946,14 @@
void setShaperSpace(const char * shaperSpace);
//!cpp:function:: get the shaper colorspace that has been set
const char * getShaperSpace() const;
+
+//!cpp:function:: set the looks to be applied during baking
+// Looks is a potentially comma (or colon) delimited list of lookNames,
+// Where +/- prefixes are optionally allowed to denote forward/inverse
+// look specification. (And forward is assumed in the absense of
either)
+void setLooks(const char * looks);
+//!cpp:function:: get the looks to be applied during baking
+const char * getLooks() const;
//!cpp:function:: set the target device colorspace for the lut
void setTargetSpace(const char * targetSpace);
@@ -1187,9 +1208,20 @@
//!cpp:function::
const char * getStringVar(const char * name) const;
+//!cpp:function::
int getNumStringVars() const;
+//!cpp:function::
const char * getStringVarNameByIndex(int index) const;
+//!cpp:function::
+void clearStringVars();
+
+//!cpp:function::
+void setEnvironmentMode(EnvironmentMode mode);
+
+//!cpp:function::
+EnvironmentMode getEnvironmentMode() const;
+
//!cpp:function:: Seed all string vars with the current environment.
void loadEnvironment();
Modified:
trunk/lib/darwin-9.x.universal/opencolorio/include/OpenColorIO/OpenColorTypes.h
===
---
[Bf-blender-cvs] SVN commit: /data/svn/repos/bf-blender [61862] trunk/lib/darwin-9.x.universal: OSX: update osl to 1.7.5 and oiio to 1.7.13
Revision: 61862 https://developer.blender.org/rBL61862 Author: jensverwiebe Date: 2017-04-26 17:44:39 +0200 (Wed, 26 Apr 2017) Log Message: --- OSX: update osl to 1.7.5 and oiio to 1.7.13 Modified Paths: -- trunk/lib/darwin-9.x.universal/openimageio/LICENSE trunk/lib/darwin-9.x.universal/openimageio/build.sh trunk/lib/darwin-9.x.universal/openimageio/include/OpenImageIO/array_view.h trunk/lib/darwin-9.x.universal/openimageio/include/OpenImageIO/color.h trunk/lib/darwin-9.x.universal/openimageio/include/OpenImageIO/filesystem.h trunk/lib/darwin-9.x.universal/openimageio/include/OpenImageIO/fmath.h trunk/lib/darwin-9.x.universal/openimageio/include/OpenImageIO/hash.h trunk/lib/darwin-9.x.universal/openimageio/include/OpenImageIO/imagebuf.h trunk/lib/darwin-9.x.universal/openimageio/include/OpenImageIO/imagebufalgo.h trunk/lib/darwin-9.x.universal/openimageio/include/OpenImageIO/imagebufalgo_util.h trunk/lib/darwin-9.x.universal/openimageio/include/OpenImageIO/imagecache.h trunk/lib/darwin-9.x.universal/openimageio/include/OpenImageIO/imageio.h trunk/lib/darwin-9.x.universal/openimageio/include/OpenImageIO/missing_math.h trunk/lib/darwin-9.x.universal/openimageio/include/OpenImageIO/oiioversion.h trunk/lib/darwin-9.x.universal/openimageio/include/OpenImageIO/platform.h trunk/lib/darwin-9.x.universal/openimageio/include/OpenImageIO/refcnt.h trunk/lib/darwin-9.x.universal/openimageio/include/OpenImageIO/simd.h trunk/lib/darwin-9.x.universal/openimageio/include/OpenImageIO/strutil.h trunk/lib/darwin-9.x.universal/openimageio/include/OpenImageIO/sysutil.h trunk/lib/darwin-9.x.universal/openimageio/include/OpenImageIO/texture.h trunk/lib/darwin-9.x.universal/openimageio/include/OpenImageIO/thread.h trunk/lib/darwin-9.x.universal/openimageio/include/OpenImageIO/timer.h trunk/lib/darwin-9.x.universal/openimageio/include/OpenImageIO/typedesc.h trunk/lib/darwin-9.x.universal/openimageio/include/OpenImageIO/unordered_map_concurrent.h trunk/lib/darwin-9.x.universal/openimageio/include/OpenImageIO/ustring.h trunk/lib/darwin-9.x.universal/openimageio/lib/libOpenImageIO.a trunk/lib/darwin-9.x.universal/osl/CHANGES trunk/lib/darwin-9.x.universal/osl/LICENSE trunk/lib/darwin-9.x.universal/osl/README.md trunk/lib/darwin-9.x.universal/osl/bin/oslc trunk/lib/darwin-9.x.universal/osl/bin/oslinfo trunk/lib/darwin-9.x.universal/osl/doc/osl-languagespec.pdf trunk/lib/darwin-9.x.universal/osl/include/OSL/oslexec.h trunk/lib/darwin-9.x.universal/osl/include/OSL/oslversion.h trunk/lib/darwin-9.x.universal/osl/lib/liboslcomp.a trunk/lib/darwin-9.x.universal/osl/lib/liboslexec.a trunk/lib/darwin-9.x.universal/osl/lib/liboslquery.a trunk/lib/darwin-9.x.universal/osl/shaders/emitter.oso trunk/lib/darwin-9.x.universal/osl/shaders/glass.oso trunk/lib/darwin-9.x.universal/osl/shaders/image.oso trunk/lib/darwin-9.x.universal/osl/shaders/matte.oso trunk/lib/darwin-9.x.universal/osl/shaders/metal.oso trunk/lib/darwin-9.x.universal/osl/shaders/oslutil.h trunk/lib/darwin-9.x.universal/osl/shaders/stdosl.h trunk/lib/darwin-9.x.universal/osl/shaders/ubersurface.oso Added Paths: --- trunk/lib/darwin-9.x.universal/openimageio/include/OpenImageIO/atomic.h trunk/lib/darwin-9.x.universal/openimageio/include/OpenImageIO/deepdata.h trunk/lib/darwin-9.x.universal/openimageio/include/OpenImageIO/fstream_mingw.h Removed Paths: - trunk/lib/darwin-9.x.universal/osl/README trunk/lib/darwin-9.x.universal/osl/osx_osl_compile.patch trunk/lib/darwin-9.x.universal/osl/threaded_osl_osx_fix.patch Modified: trunk/lib/darwin-9.x.universal/openimageio/LICENSE === --- trunk/lib/darwin-9.x.universal/openimageio/LICENSE 2017-04-25 16:03:49 UTC (rev 61861) +++ trunk/lib/darwin-9.x.universal/openimageio/LICENSE 2017-04-26 15:44:39 UTC (rev 61862) @@ -1,19 +1,20 @@ OpenImageIO and all code, documentation, and other materials contained therein are: -Copyright 2008-2014 Larry Gritz et al. All Rights Reserved. +Copyright 2008-2016 Larry Gritz et al. All Rights Reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: -* Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. -* Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. -* Neither the name of the software's owners nor the names of its - contributors may be used to endorse or promote products derived from - this software without specific prior written
[Bf-blender-cvs] [87f483debb7] master: OSX buildbot: remove redundant option
Commit: 87f483debb7bf2d866658ea9adcb61ad3583512a
Author: Jens Verwiebe
Date: Wed Apr 26 14:28:36 2017 +0200
Branches: master
https://developer.blender.org/rB87f483debb7bf2d866658ea9adcb61ad3583512a
OSX buildbot: remove redundant option
===
M build_files/cmake/config/blender_full.cmake
M build_files/cmake/config/blender_release.cmake
===
diff --git a/build_files/cmake/config/blender_full.cmake
b/build_files/cmake/config/blender_full.cmake
index 1acc48b48ab..ecde50ff156 100644
--- a/build_files/cmake/config/blender_full.cmake
+++ b/build_files/cmake/config/blender_full.cmake
@@ -73,9 +73,8 @@ elseif(WIN32)
endif()
elseif(APPLE)
set(WITH_JACKON CACHE BOOL "" FORCE)
- set(WITH_CODEC_QUICKTIME ON CACHE BOOL "" FORCE)
+ set(WITH_CODEC_QUICKTIME OFF CACHE BOOL "" FORCE)
set(WITH_OPENSUBDIV OFF CACHE BOOL "" FORCE)
-# set(WITH_CODEC_QUICKTIME ON CACHE BOOL "" FORCE)
#
include("${CMAKE_CURRENT_SOURCE_DIR}/../platform/platform_apple_xcode.cmake")
# apple_check_quicktime()
diff --git a/build_files/cmake/config/blender_release.cmake
b/build_files/cmake/config/blender_release.cmake
index 09e2faea08e..f7239559fb8 100644
--- a/build_files/cmake/config/blender_release.cmake
+++ b/build_files/cmake/config/blender_release.cmake
@@ -74,9 +74,8 @@ elseif(WIN32)
endif()
elseif(APPLE)
set(WITH_JACKON CACHE BOOL "" FORCE)
- set(WITH_CODEC_QUICKTIME ON CACHE BOOL "" FORCE)
+ set(WITH_CODEC_QUICKTIME OFF CACHE BOOL "" FORCE)
set(WITH_OPENSUBDIV OFF CACHE BOOL "" FORCE)
-# set(WITH_CODEC_QUICKTIME ON CACHE BOOL "" FORCE)
#
include("${CMAKE_CURRENT_SOURCE_DIR}/../platform/platform_apple_xcode.cmake")
# apple_check_quicktime()
___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] [c1aea353aec] master: OSX buildbot: disable unsupported calls for now and use quicktime off default
Commit: c1aea353aec5e5070054ace630b1b2e4465238f3
Author: Jens Verwiebe
Date: Wed Apr 26 14:02:53 2017 +0200
Branches: master
https://developer.blender.org/rBc1aea353aec5e5070054ace630b1b2e4465238f3
OSX buildbot: disable unsupported calls for now and use quicktime off default
===
M build_files/cmake/config/blender_full.cmake
M build_files/cmake/config/blender_release.cmake
===
diff --git a/build_files/cmake/config/blender_full.cmake
b/build_files/cmake/config/blender_full.cmake
index 87b8ed5f921..1acc48b48ab 100644
--- a/build_files/cmake/config/blender_full.cmake
+++ b/build_files/cmake/config/blender_full.cmake
@@ -75,8 +75,8 @@ elseif(APPLE)
set(WITH_JACKON CACHE BOOL "" FORCE)
set(WITH_CODEC_QUICKTIME ON CACHE BOOL "" FORCE)
set(WITH_OPENSUBDIV OFF CACHE BOOL "" FORCE)
- set(WITH_CODEC_QUICKTIME ON CACHE BOOL "" FORCE)
+# set(WITH_CODEC_QUICKTIME ON CACHE BOOL "" FORCE)
-
include("${CMAKE_CURRENT_SOURCE_DIR}/../platform/platform_apple_xcode.cmake")
- apple_check_quicktime()
+#
include("${CMAKE_CURRENT_SOURCE_DIR}/../platform/platform_apple_xcode.cmake")
+# apple_check_quicktime()
endif()
diff --git a/build_files/cmake/config/blender_release.cmake
b/build_files/cmake/config/blender_release.cmake
index b60c8c7380c..09e2faea08e 100644
--- a/build_files/cmake/config/blender_release.cmake
+++ b/build_files/cmake/config/blender_release.cmake
@@ -76,8 +76,8 @@ elseif(APPLE)
set(WITH_JACKON CACHE BOOL "" FORCE)
set(WITH_CODEC_QUICKTIME ON CACHE BOOL "" FORCE)
set(WITH_OPENSUBDIV OFF CACHE BOOL "" FORCE)
- set(WITH_CODEC_QUICKTIME ON CACHE BOOL "" FORCE)
+# set(WITH_CODEC_QUICKTIME ON CACHE BOOL "" FORCE)
-
include("${CMAKE_CURRENT_SOURCE_DIR}/../platform/platform_apple_xcode.cmake")
- apple_check_quicktime()
+#
include("${CMAKE_CURRENT_SOURCE_DIR}/../platform/platform_apple_xcode.cmake")
+# apple_check_quicktime()
endif()
___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] [0b84f21b081] master: Fix OSX buildbot
Commit: 0b84f21b081efa6c18da6ef51b4bb29b1cde96dd
Author: Jens Verwiebe
Date: Tue Apr 25 14:05:03 2017 +0200
Branches: master
https://developer.blender.org/rB0b84f21b081efa6c18da6ef51b4bb29b1cde96dd
Fix OSX buildbot
===
M build_files/cmake/config/blender_full.cmake
M build_files/cmake/config/blender_release.cmake
===
diff --git a/build_files/cmake/config/blender_full.cmake
b/build_files/cmake/config/blender_full.cmake
index bd8a2dbaf2c..87b8ed5f921 100644
--- a/build_files/cmake/config/blender_full.cmake
+++ b/build_files/cmake/config/blender_full.cmake
@@ -77,6 +77,6 @@ elseif(APPLE)
set(WITH_OPENSUBDIV OFF CACHE BOOL "" FORCE)
set(WITH_CODEC_QUICKTIME ON CACHE BOOL "" FORCE)
-
include("${CMAKE_SOURCE_DIR}/build_files/cmake/platform/platform_apple_xcode.cmake")
+
include("${CMAKE_CURRENT_SOURCE_DIR}/../platform/platform_apple_xcode.cmake")
apple_check_quicktime()
endif()
diff --git a/build_files/cmake/config/blender_release.cmake
b/build_files/cmake/config/blender_release.cmake
index 42e8c111714..b60c8c7380c 100644
--- a/build_files/cmake/config/blender_release.cmake
+++ b/build_files/cmake/config/blender_release.cmake
@@ -78,6 +78,6 @@ elseif(APPLE)
set(WITH_OPENSUBDIV OFF CACHE BOOL "" FORCE)
set(WITH_CODEC_QUICKTIME ON CACHE BOOL "" FORCE)
-
include("${CMAKE_SOURCE_DIR}/build_files/cmake/platform/platform_apple_xcode.cmake")
+
include("${CMAKE_CURRENT_SOURCE_DIR}/../platform/platform_apple_xcode.cmake")
apple_check_quicktime()
endif()
___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] [20c9c1b44e1] master: OSX: satisfy macro to also apply alembic tests
Commit: 20c9c1b44e13e3b5bccc9b1d7e7cb512b5a3f465
Author: Jens Verwiebe
Date: Sat Apr 22 19:03:59 2017 +0200
Branches: master
https://developer.blender.org/rB20c9c1b44e13e3b5bccc9b1d7e7cb512b5a3f465
OSX: satisfy macro to also apply alembic tests
===
M build_files/cmake/platform/platform_apple.cmake
M tests/python/CMakeLists.txt
===
diff --git a/build_files/cmake/platform/platform_apple.cmake
b/build_files/cmake/platform/platform_apple.cmake
index 04485e31d98..6105f2e04de 100644
--- a/build_files/cmake/platform/platform_apple.cmake
+++ b/build_files/cmake/platform/platform_apple.cmake
@@ -23,6 +23,10 @@
# Libraries configuration for Apple.
+macro(find_package_wrapper)
+# do nothing, just satisfy the macro
+endmacro()
+
if(NOT DEFINED LIBDIR)
if(WITH_CXX11)
set(LIBDIR ${CMAKE_SOURCE_DIR}/../lib/darwin)
@@ -52,6 +56,7 @@ if(WITH_ALEMBIC)
set(ALEMBIC_INCLUDE_DIRS ${ALEMBIC_INCLUDE_DIR})
set(ALEMBIC_LIBPATH ${ALEMBIC}/lib)
set(ALEMBIC_LIBRARIES Alembic)
+ set(ALEMBIC_FOUND ON)
endif()
if(WITH_OPENSUBDIV OR WITH_CYCLES_OPENSUBDIV)
diff --git a/tests/python/CMakeLists.txt b/tests/python/CMakeLists.txt
index fa13d1acc7b..dca85dbf770 100644
--- a/tests/python/CMakeLists.txt
+++ b/tests/python/CMakeLists.txt
@@ -443,7 +443,7 @@ if(WITH_CYCLES)
endif()
endif()
-if(WITH_ALEMBIC AND NOT APPLE)
+if(WITH_ALEMBIC)
find_package_wrapper(Alembic)
if(NOT ALEMBIC_FOUND)
message(FATAL_ERROR "Alembic is enabled but cannot be found")
___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] [517bd13baab] master: Disable breaking alembic test for osx
Commit: 517bd13baab2d7c91206638f9405c9c25eee2ee1 Author: Jens Verwiebe Date: Sat Apr 22 18:39:11 2017 +0200 Branches: master https://developer.blender.org/rB517bd13baab2d7c91206638f9405c9c25eee2ee1 Disable breaking alembic test for osx === M tests/python/CMakeLists.txt === diff --git a/tests/python/CMakeLists.txt b/tests/python/CMakeLists.txt index dca85dbf770..fa13d1acc7b 100644 --- a/tests/python/CMakeLists.txt +++ b/tests/python/CMakeLists.txt @@ -443,7 +443,7 @@ if(WITH_CYCLES) endif() endif() -if(WITH_ALEMBIC) +if(WITH_ALEMBIC AND NOT APPLE) find_package_wrapper(Alembic) if(NOT ALEMBIC_FOUND) message(FATAL_ERROR "Alembic is enabled but cannot be found") ___ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org https://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] SVN commit: /data/svn/repos/bf-blender [61858] trunk/lib/darwin-9.x.universal/alembic: Upd darwin9 alembic to 1.7.1
Revision: 61858 https://developer.blender.org/rBL61858 Author: jensverwiebe Date: 2017-04-21 13:32:39 +0200 (Fri, 21 Apr 2017) Log Message: --- Upd darwin9 alembic to 1.7.1 Modified Paths: -- trunk/lib/darwin-9.x.universal/alembic/include/Alembic/Abc/Argument.h trunk/lib/darwin-9.x.universal/alembic/include/Alembic/Abc/Foundation.h trunk/lib/darwin-9.x.universal/alembic/include/Alembic/Abc/IArchive.h trunk/lib/darwin-9.x.universal/alembic/include/Alembic/Abc/IArrayProperty.h trunk/lib/darwin-9.x.universal/alembic/include/Alembic/Abc/IBaseProperty.h trunk/lib/darwin-9.x.universal/alembic/include/Alembic/Abc/ICompoundProperty.h trunk/lib/darwin-9.x.universal/alembic/include/Alembic/Abc/IObject.h trunk/lib/darwin-9.x.universal/alembic/include/Alembic/Abc/IScalarProperty.h trunk/lib/darwin-9.x.universal/alembic/include/Alembic/Abc/ISchema.h trunk/lib/darwin-9.x.universal/alembic/include/Alembic/Abc/ISchemaObject.h trunk/lib/darwin-9.x.universal/alembic/include/Alembic/Abc/ITypedArrayProperty.h trunk/lib/darwin-9.x.universal/alembic/include/Alembic/Abc/ITypedScalarProperty.h trunk/lib/darwin-9.x.universal/alembic/include/Alembic/Abc/OArchive.h trunk/lib/darwin-9.x.universal/alembic/include/Alembic/Abc/OArrayProperty.h trunk/lib/darwin-9.x.universal/alembic/include/Alembic/Abc/OBaseProperty.h trunk/lib/darwin-9.x.universal/alembic/include/Alembic/Abc/OCompoundProperty.h trunk/lib/darwin-9.x.universal/alembic/include/Alembic/Abc/OObject.h trunk/lib/darwin-9.x.universal/alembic/include/Alembic/Abc/OScalarProperty.h trunk/lib/darwin-9.x.universal/alembic/include/Alembic/Abc/OSchema.h trunk/lib/darwin-9.x.universal/alembic/include/Alembic/Abc/OSchemaObject.h trunk/lib/darwin-9.x.universal/alembic/include/Alembic/Abc/OTypedArrayProperty.h trunk/lib/darwin-9.x.universal/alembic/include/Alembic/Abc/OTypedScalarProperty.h trunk/lib/darwin-9.x.universal/alembic/include/Alembic/AbcCollection/ICollections.h trunk/lib/darwin-9.x.universal/alembic/include/Alembic/AbcCollection/OCollections.h trunk/lib/darwin-9.x.universal/alembic/include/Alembic/AbcCollection/SchemaInfoDeclarations.h trunk/lib/darwin-9.x.universal/alembic/include/Alembic/AbcCoreAbstract/MetaData.h trunk/lib/darwin-9.x.universal/alembic/include/Alembic/AbcCoreFactory/IFactory.h trunk/lib/darwin-9.x.universal/alembic/include/Alembic/AbcGeom/ICamera.h trunk/lib/darwin-9.x.universal/alembic/include/Alembic/AbcGeom/ICurves.h trunk/lib/darwin-9.x.universal/alembic/include/Alembic/AbcGeom/IFaceSet.h trunk/lib/darwin-9.x.universal/alembic/include/Alembic/AbcGeom/IGeomBase.h trunk/lib/darwin-9.x.universal/alembic/include/Alembic/AbcGeom/ILight.h trunk/lib/darwin-9.x.universal/alembic/include/Alembic/AbcGeom/INuPatch.h trunk/lib/darwin-9.x.universal/alembic/include/Alembic/AbcGeom/IPoints.h trunk/lib/darwin-9.x.universal/alembic/include/Alembic/AbcGeom/IPolyMesh.h trunk/lib/darwin-9.x.universal/alembic/include/Alembic/AbcGeom/ISubD.h trunk/lib/darwin-9.x.universal/alembic/include/Alembic/AbcGeom/IXform.h trunk/lib/darwin-9.x.universal/alembic/include/Alembic/AbcGeom/OCamera.h trunk/lib/darwin-9.x.universal/alembic/include/Alembic/AbcGeom/OCurves.h trunk/lib/darwin-9.x.universal/alembic/include/Alembic/AbcGeom/OFaceSet.h trunk/lib/darwin-9.x.universal/alembic/include/Alembic/AbcGeom/OGeomBase.h trunk/lib/darwin-9.x.universal/alembic/include/Alembic/AbcGeom/OGeomParam.h trunk/lib/darwin-9.x.universal/alembic/include/Alembic/AbcGeom/OLight.h trunk/lib/darwin-9.x.universal/alembic/include/Alembic/AbcGeom/ONuPatch.h trunk/lib/darwin-9.x.universal/alembic/include/Alembic/AbcGeom/OPoints.h trunk/lib/darwin-9.x.universal/alembic/include/Alembic/AbcGeom/OPolyMesh.h trunk/lib/darwin-9.x.universal/alembic/include/Alembic/AbcGeom/OSubD.h trunk/lib/darwin-9.x.universal/alembic/include/Alembic/AbcGeom/OXform.h trunk/lib/darwin-9.x.universal/alembic/include/Alembic/AbcGeom/SchemaInfoDeclarations.h trunk/lib/darwin-9.x.universal/alembic/include/Alembic/AbcMaterial/IMaterial.h trunk/lib/darwin-9.x.universal/alembic/include/Alembic/AbcMaterial/OMaterial.h trunk/lib/darwin-9.x.universal/alembic/include/Alembic/AbcMaterial/SchemaInfoDeclarations.h trunk/lib/darwin-9.x.universal/alembic/include/Alembic/Util/Config.h trunk/lib/darwin-9.x.universal/alembic/include/Alembic/Util/Export.h trunk/lib/darwin-9.x.universal/alembic/include/Alembic/Util/Foundation.h trunk/lib/darwin-9.x.universal/alembic/include/Alembic/Util/PlainOldDataType.h trunk/lib/darwin-9.x.universal/alembic/lib/cmake/Alembic/AlembicConfig.cmake trunk/lib/darwin-9.x.universal/alembic/lib/cmake/Alembic/AlembicConfigVersion.cmake trunk/lib/darwin-9.x.universal/alembic/lib/cmake/Alembic/AlembicTargets.cmake
[Bf-blender-cvs] [718fb3167d0] master: Fix Player stubs (tm)
Commit: 718fb3167d0ed293d6476807897dddf05b562523 Author: Jens Verwiebe Date: Sat Apr 15 01:09:44 2017 +0200 Branches: master https://developer.blender.org/rB718fb3167d0ed293d6476807897dddf05b562523 Fix Player stubs (tm) === M source/blenderplayer/bad_level_call_stubs/stubs.c === diff --git a/source/blenderplayer/bad_level_call_stubs/stubs.c b/source/blenderplayer/bad_level_call_stubs/stubs.c index 5400abc4791..300185b3b16 100644 --- a/source/blenderplayer/bad_level_call_stubs/stubs.c +++ b/source/blenderplayer/bad_level_call_stubs/stubs.c @@ -274,7 +274,8 @@ struct Object *RE_GetCamera(struct Render *re) RET_NULL float RE_lamp_get_data(struct ShadeInput *shi, struct Object *lamp_obj, float col[4], float lv[3], float *dist, float shadow[4]) RET_ZERO const float (*RE_object_instance_get_matrix(struct ObjectInstanceRen *obi, int matrix_id))[4] RET_NULL const float (*RE_render_current_get_matrix(int matrix_id))[4] RET_NULL -const float RE_object_instance_get_object_pass_index(struct ObjectInstanceRen *obi) RET_ZERO +float RE_object_instance_get_object_pass_index(struct ObjectInstanceRen *obi) RET_ZERO +float RE_object_instance_get_random_id(struct ObjectInstanceRen *obi) RET_ZERO /* blenkernel */ bool BKE_paint_proj_mesh_data_check(struct Scene *scene, struct Object *ob, bool *uvs, bool *mat, bool *tex, bool *stencil) RET_ZERO ___ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org https://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] [e04970b392] master: Fix player stubs (tm)
Commit: e04970b392cdce4cf7b2d89b6cb3e7b623629103 Author: Jens Verwiebe Date: Thu Mar 23 15:47:23 2017 +0100 Branches: master https://developer.blender.org/rBe04970b392cdce4cf7b2d89b6cb3e7b623629103 Fix player stubs (tm) === M source/blenderplayer/bad_level_call_stubs/stubs.c === diff --git a/source/blenderplayer/bad_level_call_stubs/stubs.c b/source/blenderplayer/bad_level_call_stubs/stubs.c index 3b07d0acf5..d659f5c1a8 100644 --- a/source/blenderplayer/bad_level_call_stubs/stubs.c +++ b/source/blenderplayer/bad_level_call_stubs/stubs.c @@ -737,7 +737,8 @@ int collada_export(struct Scene *sce, int use_blender_profile, int sort_by_name, BC_export_transformation_type export_transformation_type, - int open_sim) RET_ZERO + int open_sim, + int keep_bind_info) RET_ZERO void ED_mesh_calc_tessface(struct Mesh *mesh, bool free_mpoly) RET_NONE ___ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org https://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] [5c3216e233] master: Fix compiling after a0b8a9f
Commit: 5c3216e2334863137019b55a44d5b9cfea842c10
Author: Jens Verwiebe
Date: Sat Feb 25 14:58:08 2017 +0100
Branches: master
https://developer.blender.org/rB5c3216e2334863137019b55a44d5b9cfea842c10
Fix compiling after a0b8a9f
===
M source/blender/alembic/intern/abc_util.cc
===
diff --git a/source/blender/alembic/intern/abc_util.cc
b/source/blender/alembic/intern/abc_util.cc
index 158ec263df..50fa43a349 100644
--- a/source/blender/alembic/intern/abc_util.cc
+++ b/source/blender/alembic/intern/abc_util.cc
@@ -535,5 +535,5 @@ ScopeTimer::ScopeTimer(const char *message)
ScopeTimer::~ScopeTimer()
{
- std::fprintf(stderr, "%s: %fs\n", m_message, PIL_check_seconds_timer()
- m_start);
+ fprintf(stderr, "%s: %fs\n", m_message, PIL_check_seconds_timer() -
m_start);
}
___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] [92e75a54f4] fracture_modifier: Cleanup
Commit: 92e75a54f40610d045276bf743db7f365452be24
Author: Jens Verwiebe
Date: Wed Feb 22 15:57:41 2017 +0100
Branches: fracture_modifier
https://developer.blender.org/rB92e75a54f40610d045276bf743db7f365452be24
Cleanup
===
M release/scripts/startup/bl_ui/properties_physics_common.py
===
diff --git a/release/scripts/startup/bl_ui/properties_physics_common.py
b/release/scripts/startup/bl_ui/properties_physics_common.py
index 003ecf4af8..65359fa80e 100644
--- a/release/scripts/startup/bl_ui/properties_physics_common.py
+++ b/release/scripts/startup/bl_ui/properties_physics_common.py
@@ -78,7 +78,7 @@ class PHYSICS_PT_add(PhysicButtonsPanel, Panel):
physics_add(self, col, context.dynamic_paint, "Dynamic Paint",
'DYNAMIC_PAINT', 'MOD_DYNAMICPAINT', True)
physics_add(self, col, context.fracture, "Fracture", 'FRACTURE',
'MOD_EXPLODE', True)
-if obj.type == 'CURVE' or obj.type == 'SURFACE' or obj.type == 'FONT':
+if obj.type in {'CURVE', 'SURFACE', 'FONT'}:
physics_add(self, col, context.fracture, "Fracture", 'FRACTURE',
'MOD_EXPLODE', True)
col = split.column()
___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] [26bb0ee] master: Fix Playerstubs tm
Commit: 26bb0ee4641ff605e2ea397149762515fdf593a4 Author: Jens Verwiebe Date: Thu Dec 15 15:47:00 2016 +0100 Branches: master https://developer.blender.org/rB26bb0ee4641ff605e2ea397149762515fdf593a4 Fix Playerstubs tm === M source/blenderplayer/bad_level_call_stubs/stubs.c === diff --git a/source/blenderplayer/bad_level_call_stubs/stubs.c b/source/blenderplayer/bad_level_call_stubs/stubs.c index 6040dff..5cda94d 100644 --- a/source/blenderplayer/bad_level_call_stubs/stubs.c +++ b/source/blenderplayer/bad_level_call_stubs/stubs.c @@ -673,6 +673,7 @@ void RE_point_density_sample(struct Scene *scene, struct PointDensity *pd, int r void RE_point_density_free(struct PointDensity *pd) RET_NONE; void RE_instance_get_particle_info(struct ObjectInstanceRen *obi, float *index, float *age, float *lifetime, float co[3], float *size, float vel[3], float angvel[3]) RET_NONE void RE_FreeAllPersistentData(void) RET_NONE +float RE_fresnel_dielectric(float incoming[3], float normal[3], float eta) RET_NONE /* python */ struct wmOperatorType *WM_operatortype_find(const char *idname, bool quiet) RET_NULL ___ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org https://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] [f0058e4] fracture_modifier: Fix elbeem omp for msvc
Commit: f0058e49803c8923d8871c72df3aa6b16e1b87ee
Author: Jens Verwiebe
Date: Tue Oct 4 00:03:07 2016 +0200
Branches: fracture_modifier
https://developer.blender.org/rBf0058e49803c8923d8871c72df3aa6b16e1b87ee
Fix elbeem omp for msvc
===
M intern/elbeem/intern/solver_main.cpp
===
diff --git a/intern/elbeem/intern/solver_main.cpp
b/intern/elbeem/intern/solver_main.cpp
index 34bd72e..68f7c04 100644
--- a/intern/elbeem/intern/solver_main.cpp
+++ b/intern/elbeem/intern/solver_main.cpp
@@ -376,11 +376,11 @@ LbmFsgrSolver::mainLoop(const int lev)
// main loop region
const bool doReduce = true;
const int gridLoopBound=1;
- const int gDebugLevel = ::gDebugLevel;
- int calcNumInvIfCells = 0;
- LbmFloat calcInitialMass = 0;
+ int calcNumInvIfCells = 0;
+ LbmFloat calcInitialMass = 0;
GRID_REGION_INIT();
#if PARALLEL==1
+ const int gDebugLevel = ::gDebugLevel;
#pragma omp parallel default(none) num_threads(mNumOMPThreads) \
reduction(+: \
calcCurrentMass,calcCurrentVolume, \
@@ -611,8 +611,8 @@ LbmFsgrSolver::mainLoop(const int lev)
// read distribution funtions of adjacent cells = stream step
DEFAULT_STREAM;
- if((nbored & CFFluid)==0) { newFlag |= CFNoNbFluid;
calcNumInvIfCells++; }
- if((nbored & CFEmpty)==0) { newFlag |= CFNoNbEmpty;
calcNumInvIfCells++; }
+ if((nbored & CFFluid)==0) { newFlag |= CFNoNbFluid;
calcNumInvIfCells++; }
+ if((nbored & CFEmpty)==0) { newFlag |= CFNoNbEmpty;
calcNumInvIfCells++; }
// calculate mass exchange for interface cells
LbmFloat myfrac = RAC(ccel,dFfrac);
@@ -868,10 +868,8 @@ LbmFsgrSolver::mainLoop(const int lev)
// physical drop model
if(mPartUsePhysModel) {
LbmFloat realWorldFac =
(mLevel[lev].simCellSize / mLevel[lev].timestep);
- LbmFloat rux = (ux * realWorldFac);
- LbmFloat ruy = (uy * realWorldFac);
- LbmFloat ruz = (uz * realWorldFac);
- LbmFloat rl = norm(ntlVec3Gfx(rux,ruy,ruz));
+ LbmVec ru(ux * realWorldFac, uy * realWorldFac,
uz * realWorldFac);
+ LbmFloat rl = norm(ru);
basethresh *= rl;
// reduce probability in outer region?
@@ -963,14 +961,15 @@ LbmFsgrSolver::mainLoop(const int lev)
// average normal & velocity
// -> mostly along velocity dir, many into
surface
// fluid velocity (not normalized!)
- LbmVec flvelVel = LbmVec(ux,uy,uz);
+ LbmVec flvelVel(ux,uy,uz);
LbmFloat flvelLen = norm(flvelVel);
// surface normal
- LbmVec normVel =
LbmVec(surfaceNormal[0],surfaceNormal[1],surfaceNormal[2]);
+ LbmVec
normVel(surfaceNormal[0],surfaceNormal[1],surfaceNormal[2]);
normalize(normVel);
LbmFloat normScale = (0.01+flvelLen);
// jitter vector, 0.2 * flvel
- LbmVec jittVel =
LbmVec(jx,jy,jz)*(0.05+flvelLen)*0.1;
+ LbmVec jittVel(jx,jy,jz);
+ jittVel *= (0.05+flvelLen)*0.1;
// weighten velocities
const LbmFloat flvelWeight = 0.9;
LbmVec newpartVel =
normVel*normScale*(1.-flvelWeight) + flvelVel*(flvelWeight) + jittVel;
@@ -1108,8 +1107,8 @@ LbmFsgrSolver::mainLoop(const int lev)
mNumFilledCells = calcCellsFilled;
mNumEmptiedCells = calcCellsEmptied;
mNumUsedCells = calcNumUsedCells;
- mNumInvIfCells += calcNumInvIfCells;
- mInitialMass += calcInitialMass;
+ mNumInvIfCells += calcNumInvIfCells;
+ mInitialMass += calcInitialMass;
}
@@ -1120,13 +1119,13 @@ LbmFsgrSolver::preinitGrids()
const int lev = mMaxRefine;
const bool doReduce = false;
const int gridLoopBound=0;
- const int gDebugLevel = ::gDebugLevel;
// preinit both grids
for(int s=0; s<2; s++) {
GRID_REGION_INIT();
#if PARALLEL==1
+ const int gDebugLevel = ::gDebugLevel;
#pragma omp parallel default(none) num_threads(mNumOMPThreads) \
reduction(+: \
calcCurrentMass,calcCurrentVolume, \
@@ -1161,10 +1160,10 @@ LbmFsgrSo
[Bf-blender-cvs] [030bb2f] fracture_modifier: 8% faster fluidbaking with gcc and 30% faster with clang
Commit: 030bb2f7e0d3828c6efc8dfade51d3d077981436
Author: Jens Verwiebe
Date: Sun Oct 2 17:58:40 2016 +0200
Branches: fracture_modifier
https://developer.blender.org/rB030bb2f7e0d3828c6efc8dfade51d3d077981436
8% faster fluidbaking with gcc and 30% faster with clang
===
M intern/elbeem/intern/solver_class.h
M intern/elbeem/intern/solver_main.cpp
===
diff --git a/intern/elbeem/intern/solver_class.h
b/intern/elbeem/intern/solver_class.h
index 593fea1..2b2e214 100644
--- a/intern/elbeem/intern/solver_class.h
+++ b/intern/elbeem/intern/solver_class.h
@@ -332,7 +332,7 @@ class LbmFsgrSolver :
void debugMarkCellCall(int level, int vi,int vj,int vk);
// loop over grid, stream update
- void mainLoop(int lev);
+ void mainLoop(const int lev);
// change time step size
void adaptTimestep();
//! init mObjectSpeeds for current parametrization
diff --git a/intern/elbeem/intern/solver_main.cpp
b/intern/elbeem/intern/solver_main.cpp
index 55a8d3e..34bd72e 100644
--- a/intern/elbeem/intern/solver_main.cpp
+++ b/intern/elbeem/intern/solver_main.cpp
@@ -355,7 +355,7 @@ void LbmFsgrSolver::fineAdvance()
//! fine step function
/*/
void
-LbmFsgrSolver::mainLoop(int lev)
+LbmFsgrSolver::mainLoop(const int lev)
{
// loops over _only inner_ cells
---
@@ -376,13 +376,16 @@ LbmFsgrSolver::mainLoop(int lev)
// main loop region
const bool doReduce = true;
const int gridLoopBound=1;
+ const int gDebugLevel = ::gDebugLevel;
+ int calcNumInvIfCells = 0;
+ LbmFloat calcInitialMass = 0;
GRID_REGION_INIT();
#if PARALLEL==1
-#pragma omp parallel default(shared) num_threads(mNumOMPThreads) \
+#pragma omp parallel default(none) num_threads(mNumOMPThreads) \
reduction(+: \
calcCurrentMass,calcCurrentVolume, \
calcCellsFilled,calcCellsEmptied, \
- calcNumUsedCells )
+ calcNumUsedCells,calcNumInvIfCells,calcInitialMass)
GRID_REGION_START();
#else // PARALLEL==1
GRID_REGION_START();
@@ -468,7 +471,7 @@ LbmFsgrSolver::mainLoop(int lev)
calcCurrentMass += iniRho;
calcCurrentVolume += 1.0;
calcNumUsedCells++;
- mInitialMass += iniRho;
+ calcInitialMass += iniRho;
// dont treat cell until next step
continue;
}
@@ -479,7 +482,7 @@ LbmFsgrSolver::mainLoop(int lev)
if(isnotValid) {
// remove fluid cells, shouldnt be here anyway
LbmFloat fluidRho = m[0]; FORDF1 { fluidRho +=
m[l]; }
- mInitialMass -= fluidRho;
+ calcInitialMass -= fluidRho;
const LbmFloat iniRho = 0.0;
RAC(tcel, dMass) = RAC(tcel, dFfrac) = iniRho;
RAC(tcel, dFlux) = FLUX_INIT;
@@ -608,8 +611,8 @@ LbmFsgrSolver::mainLoop(int lev)
// read distribution funtions of adjacent cells = stream step
DEFAULT_STREAM;
- if((nbored & CFFluid)==0) { newFlag |= CFNoNbFluid;
mNumInvIfCells++; }
- if((nbored & CFEmpty)==0) { newFlag |= CFNoNbEmpty;
mNumInvIfCells++; }
+ if((nbored & CFFluid)==0) { newFlag |= CFNoNbFluid;
calcNumInvIfCells++; }
+ if((nbored & CFEmpty)==0) { newFlag |= CFNoNbEmpty;
calcNumInvIfCells++; }
// calculate mass exchange for interface cells
LbmFloat myfrac = RAC(ccel,dFfrac);
@@ -809,7 +812,7 @@ LbmFsgrSolver::mainLoop(int lev)
// fill if cells in inflow region
if(myfrac<0.5) {
mass += 0.25;
- mInitialMass += 0.25;
+ calcInitialMass += 0.25;
}
const int OId = oldFlag>>24;
const LbmVec vel(mObjectSpeeds[OId]);
@@ -1013,7 +1016,7 @@ LbmFsgrSolver::mainLoop(int lev)
if( (mass) <= (rho * ( -FSGR_MAGICNR)) ) { ifemptied = 1; }
if(oldFlag & (CFMbndOutflow)) {
- mInitialMass -= mass;
+ calcInitialMass -= mass;
mass = myfrac = 0.0;
[Bf-blender-cvs] [988b4e2] master: Tentative compile fix after recent gpu debug changes
Commit: 988b4e2c80d85cdacc165a1ab660c5f481485c6a
Author: Jens Verwiebe
Date: Mon Aug 15 13:46:38 2016 +0200
Branches: master
https://developer.blender.org/rB988b4e2c80d85cdacc165a1ab660c5f481485c6a
Tentative compile fix after recent gpu debug changes
===
M source/blender/gpu/intern/gpu_debug.c
===
diff --git a/source/blender/gpu/intern/gpu_debug.c
b/source/blender/gpu/intern/gpu_debug.c
index 21458a2..8d1ab43 100644
--- a/source/blender/gpu/intern/gpu_debug.c
+++ b/source/blender/gpu/intern/gpu_debug.c
@@ -43,6 +43,10 @@
#define CASE_CODE_RETURN_STR(code) case code: return #code;
+#if (defined(__GNUC__) && !defined(__clang__)) && defined(NDEBUG)
+# pragma GCC diagnostic ignored "-Wimplicit-function-declaration"
+#endif
+
static const char *gpu_gl_error_symbol(GLenum err)
{
switch (err) {
___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] [c10b484] cycles_disney_brdf: Rollback attempt to fix sss crashing, it prevented crash by disabling sss completely, thus useless
Commit: c10b484dcad3412c34455736e9656cd38716bcb0
Author: Jens Verwiebe
Date: Fri Jul 22 01:15:21 2016 +0200
Branches: cycles_disney_brdf
https://developer.blender.org/rBc10b484dcad3412c34455736e9656cd38716bcb0
Rollback attempt to fix sss crashing, it prevented crash by disabling sss
completely, thus useless
===
M intern/cycles/kernel/svm/svm_closure.h
===
diff --git a/intern/cycles/kernel/svm/svm_closure.h
b/intern/cycles/kernel/svm/svm_closure.h
index 2b1a081..64a290d 100644
--- a/intern/cycles/kernel/svm/svm_closure.h
+++ b/intern/cycles/kernel/svm/svm_closure.h
@@ -187,13 +187,6 @@ ccl_device void svm_node_closure_bsdf(KernelGlobals *kg,
ShaderData *sd, float *
float3 weight = sc->weight;
float sample_weight = sc->sample_weight;
-#ifdef __BSDF_DISNEY_DIFFUSE__
-# ifndef __SPLIT_KERNEL__
-#define sc_next(sc) sc++
-# else
-#define sc_next(sc) sc = ccl_fetch_array(sd, closure, ccl_fetch(sd,
num_closure))
-# endif
-
/* subsurface */
float3 albedo = baseColor;
float3 subsurf_weight = baseColor * sc->weight *
mix_weight * subsurface * diffuse_weight;
@@ -222,7 +215,6 @@ ccl_device void svm_node_closure_bsdf(KernelGlobals *kg,
ShaderData *sd, float *
ccl_fetch(sd, flag) |= bssrdf_setup(sc,
(ClosureType)CLOSURE_BSSRDF_BURLEY_ID);
ccl_fetch(sd, num_closure)++;
- sc_next(sc);
}
if (fabsf(subsurf_weight.y) > 0.0f) {
@@ -241,7 +233,6 @@ ccl_device void svm_node_closure_bsdf(KernelGlobals *kg,
ShaderData *sd, float *
ccl_fetch(sd, flag) |= bssrdf_setup(sc,
(ClosureType)CLOSURE_BSSRDF_BURLEY_ID);
ccl_fetch(sd, num_closure)++;
- sc_next(sc);
}
if (fabsf(subsurf_weight.z) > 0.0f) {
@@ -260,13 +251,9 @@ ccl_device void svm_node_closure_bsdf(KernelGlobals *kg,
ShaderData *sd, float *
ccl_fetch(sd, flag) |= bssrdf_setup(sc,
(ClosureType)CLOSURE_BSSRDF_BURLEY_ID);
ccl_fetch(sd, num_closure)++;
- sc_next(sc);
}
}
-# undef sc_next
-#endif // __BSDF_DISNEY_DIFFUSE__
-
/* diffuse */
if (metallic < 1.0f) {
if (ccl_fetch(sd, num_closure) < MAX_CLOSURE) {
___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] [462bba3] cycles_disney_brdf: Add an undef for sc_next for safety
Commit: 462bba3f97fcc41834e0e20cc806a7958e5106f5 Author: Jens Verwiebe Date: Thu Jul 21 23:11:59 2016 +0200 Branches: cycles_disney_brdf https://developer.blender.org/rB462bba3f97fcc41834e0e20cc806a7958e5106f5 Add an undef for sc_next for safety === M intern/cycles/kernel/svm/svm_closure.h === diff --git a/intern/cycles/kernel/svm/svm_closure.h b/intern/cycles/kernel/svm/svm_closure.h index 2c04e9c..2b1a081 100644 --- a/intern/cycles/kernel/svm/svm_closure.h +++ b/intern/cycles/kernel/svm/svm_closure.h @@ -264,6 +264,7 @@ ccl_device void svm_node_closure_bsdf(KernelGlobals *kg, ShaderData *sd, float * } } +# undef sc_next #endif // __BSDF_DISNEY_DIFFUSE__ /* diffuse */ ___ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org https://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] [32d3485] cycles_disney_brdf: Attempt to fix Disney SSS
Commit: 32d348577d69be251aa04110c5f6156cd2645f48
Author: Jens Verwiebe
Date: Thu Jul 21 00:15:48 2016 +0200
Branches: cycles_disney_brdf
https://developer.blender.org/rB32d348577d69be251aa04110c5f6156cd2645f48
Attempt to fix Disney SSS
===
M intern/cycles/kernel/svm/svm_closure.h
===
diff --git a/intern/cycles/kernel/svm/svm_closure.h
b/intern/cycles/kernel/svm/svm_closure.h
index 64a290d..2c04e9c 100644
--- a/intern/cycles/kernel/svm/svm_closure.h
+++ b/intern/cycles/kernel/svm/svm_closure.h
@@ -187,6 +187,13 @@ ccl_device void svm_node_closure_bsdf(KernelGlobals *kg,
ShaderData *sd, float *
float3 weight = sc->weight;
float sample_weight = sc->sample_weight;
+#ifdef __BSDF_DISNEY_DIFFUSE__
+# ifndef __SPLIT_KERNEL__
+#define sc_next(sc) sc++
+# else
+#define sc_next(sc) sc = ccl_fetch_array(sd, closure, ccl_fetch(sd,
num_closure))
+# endif
+
/* subsurface */
float3 albedo = baseColor;
float3 subsurf_weight = baseColor * sc->weight *
mix_weight * subsurface * diffuse_weight;
@@ -215,6 +222,7 @@ ccl_device void svm_node_closure_bsdf(KernelGlobals *kg,
ShaderData *sd, float *
ccl_fetch(sd, flag) |= bssrdf_setup(sc,
(ClosureType)CLOSURE_BSSRDF_BURLEY_ID);
ccl_fetch(sd, num_closure)++;
+ sc_next(sc);
}
if (fabsf(subsurf_weight.y) > 0.0f) {
@@ -233,6 +241,7 @@ ccl_device void svm_node_closure_bsdf(KernelGlobals *kg,
ShaderData *sd, float *
ccl_fetch(sd, flag) |= bssrdf_setup(sc,
(ClosureType)CLOSURE_BSSRDF_BURLEY_ID);
ccl_fetch(sd, num_closure)++;
+ sc_next(sc);
}
if (fabsf(subsurf_weight.z) > 0.0f) {
@@ -251,9 +260,12 @@ ccl_device void svm_node_closure_bsdf(KernelGlobals *kg,
ShaderData *sd, float *
ccl_fetch(sd, flag) |= bssrdf_setup(sc,
(ClosureType)CLOSURE_BSSRDF_BURLEY_ID);
ccl_fetch(sd, num_closure)++;
+ sc_next(sc);
}
}
+#endif // __BSDF_DISNEY_DIFFUSE__
+
/* diffuse */
if (metallic < 1.0f) {
if (ccl_fetch(sd, num_closure) < MAX_CLOSURE) {
___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] [3ff8aff] alembic_basic_io: Fix compiling after recent cleanup
Commit: 3ff8aff50091a3e6ca09b5f28ef9b3beb6589a06 Author: Jens Verwiebe Date: Wed Jul 20 22:39:47 2016 +0200 Branches: alembic_basic_io https://developer.blender.org/rB3ff8aff50091a3e6ca09b5f28ef9b3beb6589a06 Fix compiling after recent cleanup === M source/blender/alembic/intern/abc_mesh.cc === diff --git a/source/blender/alembic/intern/abc_mesh.cc b/source/blender/alembic/intern/abc_mesh.cc index 64ca552..998df24 100644 --- a/source/blender/alembic/intern/abc_mesh.cc +++ b/source/blender/alembic/intern/abc_mesh.cc @@ -755,7 +755,7 @@ static void assign_materials(Main *bmain, Object *ob, const std::maphttps://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] [3e05be9] soc-2016-cycles_denoising: Fix playerstubs
Commit: 3e05be953f619b78c8721631549f9babb0950f4c
Author: Jens Verwiebe
Date: Tue Jul 19 13:29:59 2016 +0200
Branches: soc-2016-cycles_denoising
https://developer.blender.org/rB3e05be953f619b78c8721631549f9babb0950f4c
Fix playerstubs
===
M source/blenderplayer/bad_level_call_stubs/stubs.c
===
diff --git a/source/blenderplayer/bad_level_call_stubs/stubs.c
b/source/blenderplayer/bad_level_call_stubs/stubs.c
index 7c7958a..661532b 100644
--- a/source/blenderplayer/bad_level_call_stubs/stubs.c
+++ b/source/blenderplayer/bad_level_call_stubs/stubs.c
@@ -227,7 +227,7 @@ void EDBM_mesh_normals_update(struct BMEditMesh *em)
RET_NONE
void *g_system;
bool EDBM_mtexpoly_check(struct BMEditMesh *em) RET_ZERO
-float *RE_RenderLayerGetPass(volatile struct RenderLayer *rl, int passtype,
const char *viewname) RET_NULL
+float *RE_RenderLayerGetPass(volatile struct RenderLayer *rl, uint64_t
passtype, const char *viewname) RET_NULL
float RE_filter_value(int type, float x) RET_ZERO
struct RenderLayer *RE_GetRenderLayer(struct RenderResult *rr, const char
*name) RET_NULL
void RE_texture_rng_init() RET_NONE
@@ -241,8 +241,9 @@ float RE_engine_get_camera_shift_x(struct RenderEngine
*engine, struct Object *c
int RE_engine_get_spherical_stereo(struct RenderEngine *engine, struct Object
*camera) RET_ZERO
void RE_SetActiveRenderView(struct Render *re, const char *viewname)
{STUB_ASSERT(0);}
-struct RenderPass *RE_pass_find_by_type(volatile struct RenderLayer *rl, int
passtype, const char *viewname) RET_NULL
+struct RenderPass *RE_pass_find_by_type(volatile struct RenderLayer *rl,
uint64_t passtype, const char *viewname) RET_NULL
bool RE_HasFakeLayer(RenderResult *res) RET_ZERO
+void RE_engine_add_pass(RenderEngine *engine, int passtype, int channels,
const char *layername, const char *viewname) RET_NONE
/* zbuf.c stub */
void antialias_tagbuf(int xsize, int ysize, char *rectmove) RET_NONE
___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] [9e5635b] soc-2016-uv_tools: Compilefix for conflicting types
Commit: 9e5635b8a20564614019e2b021687581ba16a08e Author: Jens Verwiebe Date: Mon Jul 18 19:46:59 2016 +0200 Branches: soc-2016-uv_tools https://developer.blender.org/rB9e5635b8a20564614019e2b021687581ba16a08e Compilefix for conflicting types === M source/blender/editors/uvedit/uvedit_parametrizer.h === diff --git a/source/blender/editors/uvedit/uvedit_parametrizer.h b/source/blender/editors/uvedit/uvedit_parametrizer.h index 3698c52..710d4fd 100644 --- a/source/blender/editors/uvedit/uvedit_parametrizer.h +++ b/source/blender/editors/uvedit/uvedit_parametrizer.h @@ -1,3 +1,4 @@ + /* * * BEGIN GPL LICENSE BLOCK * * @@ -105,7 +106,7 @@ void param_pack(ParamHandle *handle, float margin, bool do_rotate); /* Packing 2.0 */ void param_irregular_pack_begin(ParamHandle *handle); -void param_irregular_pack_iter(ParamHandle *handle, float *w_area, int seed); +void param_irregular_pack_iter(ParamHandle *handle, float *w_area, unsigned int seed); void param_irregular_pack_end(ParamHandle *handle); /* Average area for all charts */ ___ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org https://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] [5f88388] alembic_basic_io: Fix own mistake: adding boost inc done wrong way
Commit: 5f88388680be8ed2cdaab66b53ec502f7d20dc36
Author: Jens Verwiebe
Date: Thu Jul 14 19:09:44 2016 +0200
Branches: alembic_basic_io
https://developer.blender.org/rB5f88388680be8ed2cdaab66b53ec502f7d20dc36
Fix own mistake: adding boost inc done wrong way
===
M source/blender/alembic/CMakeLists.txt
===
diff --git a/source/blender/alembic/CMakeLists.txt
b/source/blender/alembic/CMakeLists.txt
index 3c90517..f579a3b 100644
--- a/source/blender/alembic/CMakeLists.txt
+++ b/source/blender/alembic/CMakeLists.txt
@@ -39,10 +39,12 @@ set(INC_SYS
${ALEMBIC_INCLUDE_DIRS}
${HDF5_INCLUDE_DIRS}
${OPENEXR_INCLUDE_DIRS}
+)
if(APPLE)
- ${BOOST_INCLUDE_DIR}
+ list(APPEND INC_SYS
+ ${BOOST_INCLUDE_DIR}
+ )
endif()
-)
set(SRC
intern/abc_camera.cc
___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] [ff287bd] alembic_basic_io: Fix OSX compile issue
Commit: ff287bd16856ffd1b8b2aacc56ceffabcc1df969
Author: Jens Verwiebe
Date: Sun Jul 3 22:14:31 2016 +0200
Branches: alembic_basic_io
https://developer.blender.org/rBff287bd16856ffd1b8b2aacc56ceffabcc1df969
Fix OSX compile issue
===
M source/blender/alembic/CMakeLists.txt
===
diff --git a/source/blender/alembic/CMakeLists.txt
b/source/blender/alembic/CMakeLists.txt
index d0bcf42..3c90517 100644
--- a/source/blender/alembic/CMakeLists.txt
+++ b/source/blender/alembic/CMakeLists.txt
@@ -39,6 +39,9 @@ set(INC_SYS
${ALEMBIC_INCLUDE_DIRS}
${HDF5_INCLUDE_DIRS}
${OPENEXR_INCLUDE_DIRS}
+if(APPLE)
+ ${BOOST_INCLUDE_DIR}
+endif()
)
set(SRC
___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] [1e03976] alembic_basic_io: Fix OSX alembic lookup
Commit: 1e0397645b1e3425663ac5b37e69890cc5d065a4
Author: Jens Verwiebe
Date: Sun Jul 3 21:52:35 2016 +0200
Branches: alembic_basic_io
https://developer.blender.org/rB1e0397645b1e3425663ac5b37e69890cc5d065a4
Fix OSX alembic lookup
===
M CMakeLists.txt
===
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 874ed17..918b965 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -328,7 +328,7 @@ option(WITH_ALEMBIC "Enable Alembic Support"
OFF)
option(WITH_ALEMBIC_HDF5"Enable Legacy Alembic Support" OFF)
# alembic
-if(WITH_ALEMBIC)
+if(WITH_ALEMBIC AND NOT APPLE) # LIBDIR not yet set, so cannot set root dirs
for lookup !
find_package(Alembic)
if(WITH_ALEMBIC_HDF5)
@@ -2062,6 +2062,20 @@ elseif(APPLE)
endif()
endif()
+ if(WITH_ALEMBIC)
+ set(ALEMBIC_ROOT_DIR ${LIBDIR}/alembic)
+ find_package(Alembic)
+ if(WITH_ALEMBIC_HDF5)
+ set(HDF5_ROOT_DIR ${LIBDIR}/hdf5)
+ find_package(HDF5)
+ endif()
+
+ if(NOT ALEMBIC_FOUND OR (WITH_ALEMBIC_HDF5 AND NOT HDF5_FOUND))
+ set(WITH_ALEMBIC OFF)
+ set(WITH_ALEMBIC_HDF5 OFF)
+ endif()
+ endif()
+
if(WITH_OPENSUBDIV)
set(OPENSUBDIV ${LIBDIR}/opensubdiv)
set(OPENSUBDIV_LIBPATH ${OPENSUBDIV}/lib)
___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] SVN commit: /data/svn/repos/bf-blender [61687] trunk/lib/darwin-9.x.universal/alembic: Add alembic 1.6
Revision: 61687 https://developer.blender.org/rBL61687 Author: jensverwiebe Date: 2016-07-02 18:33:57 +0200 (Sat, 02 Jul 2016) Log Message: --- Add alembic 1.6 Added Paths: --- trunk/lib/darwin-9.x.universal/alembic/include/ trunk/lib/darwin-9.x.universal/alembic/include/Alembic/ trunk/lib/darwin-9.x.universal/alembic/include/Alembic/Abc/ trunk/lib/darwin-9.x.universal/alembic/include/Alembic/Abc/All.h trunk/lib/darwin-9.x.universal/alembic/include/Alembic/Abc/ArchiveInfo.h trunk/lib/darwin-9.x.universal/alembic/include/Alembic/Abc/Argument.h trunk/lib/darwin-9.x.universal/alembic/include/Alembic/Abc/Base.h trunk/lib/darwin-9.x.universal/alembic/include/Alembic/Abc/ErrorHandler.h trunk/lib/darwin-9.x.universal/alembic/include/Alembic/Abc/Foundation.h trunk/lib/darwin-9.x.universal/alembic/include/Alembic/Abc/IArchive.h trunk/lib/darwin-9.x.universal/alembic/include/Alembic/Abc/IArrayProperty.h trunk/lib/darwin-9.x.universal/alembic/include/Alembic/Abc/IBaseProperty.h trunk/lib/darwin-9.x.universal/alembic/include/Alembic/Abc/ICompoundProperty.h trunk/lib/darwin-9.x.universal/alembic/include/Alembic/Abc/IObject.h trunk/lib/darwin-9.x.universal/alembic/include/Alembic/Abc/ISampleSelector.h trunk/lib/darwin-9.x.universal/alembic/include/Alembic/Abc/IScalarProperty.h trunk/lib/darwin-9.x.universal/alembic/include/Alembic/Abc/ISchema.h trunk/lib/darwin-9.x.universal/alembic/include/Alembic/Abc/ISchemaObject.h trunk/lib/darwin-9.x.universal/alembic/include/Alembic/Abc/ITypedArrayProperty.h trunk/lib/darwin-9.x.universal/alembic/include/Alembic/Abc/ITypedScalarProperty.h trunk/lib/darwin-9.x.universal/alembic/include/Alembic/Abc/OArchive.h trunk/lib/darwin-9.x.universal/alembic/include/Alembic/Abc/OArrayProperty.h trunk/lib/darwin-9.x.universal/alembic/include/Alembic/Abc/OBaseProperty.h trunk/lib/darwin-9.x.universal/alembic/include/Alembic/Abc/OCompoundProperty.h trunk/lib/darwin-9.x.universal/alembic/include/Alembic/Abc/OObject.h trunk/lib/darwin-9.x.universal/alembic/include/Alembic/Abc/OScalarProperty.h trunk/lib/darwin-9.x.universal/alembic/include/Alembic/Abc/OSchema.h trunk/lib/darwin-9.x.universal/alembic/include/Alembic/Abc/OSchemaObject.h trunk/lib/darwin-9.x.universal/alembic/include/Alembic/Abc/OTypedArrayProperty.h trunk/lib/darwin-9.x.universal/alembic/include/Alembic/Abc/OTypedScalarProperty.h trunk/lib/darwin-9.x.universal/alembic/include/Alembic/Abc/Reference.h trunk/lib/darwin-9.x.universal/alembic/include/Alembic/Abc/SourceName.h trunk/lib/darwin-9.x.universal/alembic/include/Alembic/Abc/TypedArraySample.h trunk/lib/darwin-9.x.universal/alembic/include/Alembic/Abc/TypedPropertyTraits.h trunk/lib/darwin-9.x.universal/alembic/include/Alembic/AbcCollection/ trunk/lib/darwin-9.x.universal/alembic/include/Alembic/AbcCollection/All.h trunk/lib/darwin-9.x.universal/alembic/include/Alembic/AbcCollection/ICollections.h trunk/lib/darwin-9.x.universal/alembic/include/Alembic/AbcCollection/OCollections.h trunk/lib/darwin-9.x.universal/alembic/include/Alembic/AbcCollection/SchemaInfoDeclarations.h trunk/lib/darwin-9.x.universal/alembic/include/Alembic/AbcCoreAbstract/ trunk/lib/darwin-9.x.universal/alembic/include/Alembic/AbcCoreAbstract/All.h trunk/lib/darwin-9.x.universal/alembic/include/Alembic/AbcCoreAbstract/ArchiveReader.h trunk/lib/darwin-9.x.universal/alembic/include/Alembic/AbcCoreAbstract/ArchiveWriter.h trunk/lib/darwin-9.x.universal/alembic/include/Alembic/AbcCoreAbstract/ArrayPropertyReader.h trunk/lib/darwin-9.x.universal/alembic/include/Alembic/AbcCoreAbstract/ArrayPropertyWriter.h trunk/lib/darwin-9.x.universal/alembic/include/Alembic/AbcCoreAbstract/ArraySample.h trunk/lib/darwin-9.x.universal/alembic/include/Alembic/AbcCoreAbstract/ArraySampleKey.h trunk/lib/darwin-9.x.universal/alembic/include/Alembic/AbcCoreAbstract/BasePropertyReader.h trunk/lib/darwin-9.x.universal/alembic/include/Alembic/AbcCoreAbstract/BasePropertyWriter.h trunk/lib/darwin-9.x.universal/alembic/include/Alembic/AbcCoreAbstract/CompoundPropertyReader.h trunk/lib/darwin-9.x.universal/alembic/include/Alembic/AbcCoreAbstract/CompoundPropertyWriter.h trunk/lib/darwin-9.x.universal/alembic/include/Alembic/AbcCoreAbstract/DataType.h trunk/lib/darwin-9.x.universal/alembic/include/Alembic/AbcCoreAbstract/ForwardDeclarations.h trunk/lib/darwin-9.x.universal/alembic/include/Alembic/AbcCoreAbstract/Foundation.h trunk/lib/darwin-9.x.universal/alembic/include/Alembic/AbcCoreAbstract/MetaData.h trunk/lib/darwin-9.x.universal/alembic/include/Alembic/AbcCoreAbstract/ObjectHeader.h trunk/lib/darwin-9.x.universal/alembic/include/Alembic/AbcCoreAbstract/ObjectReader.h
[Bf-blender-cvs] SVN commit: /data/svn/repos/bf-blender [61686] trunk/lib/darwin-9.x.universal/alembic: Remove alembic 1.5.x
Revision: 61686 https://developer.blender.org/rBL61686 Author: jensverwiebe Date: 2016-07-02 18:33:00 +0200 (Sat, 02 Jul 2016) Log Message: --- Remove alembic 1.5.x Removed Paths: - trunk/lib/darwin-9.x.universal/alembic/include/ trunk/lib/darwin-9.x.universal/alembic/lib/ ___ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org https://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] SVN commit: /data/svn/repos/bf-blender [61685] trunk/lib/darwin-9.x.universal/alembic: alembic libs for osx 10.6+
Revision: 61685 https://developer.blender.org/rBL61685 Author: jensverwiebe Date: 2016-06-25 18:26:10 +0200 (Sat, 25 Jun 2016) Log Message: --- alembic libs for osx 10.6+ Added Paths: --- trunk/lib/darwin-9.x.universal/alembic/ trunk/lib/darwin-9.x.universal/alembic/include/ trunk/lib/darwin-9.x.universal/alembic/include/Alembic/ trunk/lib/darwin-9.x.universal/alembic/include/Alembic/Abc/ trunk/lib/darwin-9.x.universal/alembic/include/Alembic/Abc/All.h trunk/lib/darwin-9.x.universal/alembic/include/Alembic/Abc/ArchiveInfo.h trunk/lib/darwin-9.x.universal/alembic/include/Alembic/Abc/Argument.h trunk/lib/darwin-9.x.universal/alembic/include/Alembic/Abc/Base.h trunk/lib/darwin-9.x.universal/alembic/include/Alembic/Abc/ErrorHandler.h trunk/lib/darwin-9.x.universal/alembic/include/Alembic/Abc/Foundation.h trunk/lib/darwin-9.x.universal/alembic/include/Alembic/Abc/IArchive.h trunk/lib/darwin-9.x.universal/alembic/include/Alembic/Abc/IArrayProperty.h trunk/lib/darwin-9.x.universal/alembic/include/Alembic/Abc/IBaseProperty.h trunk/lib/darwin-9.x.universal/alembic/include/Alembic/Abc/ICompoundProperty.h trunk/lib/darwin-9.x.universal/alembic/include/Alembic/Abc/IObject.h trunk/lib/darwin-9.x.universal/alembic/include/Alembic/Abc/ISampleSelector.h trunk/lib/darwin-9.x.universal/alembic/include/Alembic/Abc/IScalarProperty.h trunk/lib/darwin-9.x.universal/alembic/include/Alembic/Abc/ISchema.h trunk/lib/darwin-9.x.universal/alembic/include/Alembic/Abc/ISchemaObject.h trunk/lib/darwin-9.x.universal/alembic/include/Alembic/Abc/ITypedArrayProperty.h trunk/lib/darwin-9.x.universal/alembic/include/Alembic/Abc/ITypedScalarProperty.h trunk/lib/darwin-9.x.universal/alembic/include/Alembic/Abc/OArchive.h trunk/lib/darwin-9.x.universal/alembic/include/Alembic/Abc/OArrayProperty.h trunk/lib/darwin-9.x.universal/alembic/include/Alembic/Abc/OBaseProperty.h trunk/lib/darwin-9.x.universal/alembic/include/Alembic/Abc/OCompoundProperty.h trunk/lib/darwin-9.x.universal/alembic/include/Alembic/Abc/OObject.h trunk/lib/darwin-9.x.universal/alembic/include/Alembic/Abc/OScalarProperty.h trunk/lib/darwin-9.x.universal/alembic/include/Alembic/Abc/OSchema.h trunk/lib/darwin-9.x.universal/alembic/include/Alembic/Abc/OSchemaObject.h trunk/lib/darwin-9.x.universal/alembic/include/Alembic/Abc/OTypedArrayProperty.h trunk/lib/darwin-9.x.universal/alembic/include/Alembic/Abc/OTypedScalarProperty.h trunk/lib/darwin-9.x.universal/alembic/include/Alembic/Abc/Reference.h trunk/lib/darwin-9.x.universal/alembic/include/Alembic/Abc/SourceName.h trunk/lib/darwin-9.x.universal/alembic/include/Alembic/Abc/TypedArraySample.h trunk/lib/darwin-9.x.universal/alembic/include/Alembic/Abc/TypedPropertyTraits.h trunk/lib/darwin-9.x.universal/alembic/include/Alembic/AbcCollection/ trunk/lib/darwin-9.x.universal/alembic/include/Alembic/AbcCollection/All.h trunk/lib/darwin-9.x.universal/alembic/include/Alembic/AbcCollection/ICollections.h trunk/lib/darwin-9.x.universal/alembic/include/Alembic/AbcCollection/OCollections.h trunk/lib/darwin-9.x.universal/alembic/include/Alembic/AbcCollection/SchemaInfoDeclarations.h trunk/lib/darwin-9.x.universal/alembic/include/Alembic/AbcCoreAbstract/ trunk/lib/darwin-9.x.universal/alembic/include/Alembic/AbcCoreAbstract/All.h trunk/lib/darwin-9.x.universal/alembic/include/Alembic/AbcCoreAbstract/ArchiveReader.h trunk/lib/darwin-9.x.universal/alembic/include/Alembic/AbcCoreAbstract/ArchiveWriter.h trunk/lib/darwin-9.x.universal/alembic/include/Alembic/AbcCoreAbstract/ArrayPropertyReader.h trunk/lib/darwin-9.x.universal/alembic/include/Alembic/AbcCoreAbstract/ArrayPropertyWriter.h trunk/lib/darwin-9.x.universal/alembic/include/Alembic/AbcCoreAbstract/ArraySample.h trunk/lib/darwin-9.x.universal/alembic/include/Alembic/AbcCoreAbstract/ArraySampleKey.h trunk/lib/darwin-9.x.universal/alembic/include/Alembic/AbcCoreAbstract/BasePropertyReader.h trunk/lib/darwin-9.x.universal/alembic/include/Alembic/AbcCoreAbstract/BasePropertyWriter.h trunk/lib/darwin-9.x.universal/alembic/include/Alembic/AbcCoreAbstract/CompoundPropertyReader.h trunk/lib/darwin-9.x.universal/alembic/include/Alembic/AbcCoreAbstract/CompoundPropertyWriter.h trunk/lib/darwin-9.x.universal/alembic/include/Alembic/AbcCoreAbstract/DataType.h trunk/lib/darwin-9.x.universal/alembic/include/Alembic/AbcCoreAbstract/ForwardDeclarations.h trunk/lib/darwin-9.x.universal/alembic/include/Alembic/AbcCoreAbstract/Foundation.h trunk/lib/darwin-9.x.universal/alembic/include/Alembic/AbcCoreAbstract/MetaData.h trunk/lib/darwin-9.x.universal/alembic/include/Alembic/AbcCoreAbstract/ObjectHeader.h trunk/lib/darwin-9.x.universal/alembic/include/Alembic/AbcCoreAbstract/ObjectReader.h
[Bf-blender-cvs] SVN commit: /data/svn/repos/bf-blender [61684] trunk/lib/darwin-9.x.universal: hdf5 libs for osx 10.+
Revision: 61684 https://developer.blender.org/rBL61684 Author: jensverwiebe Date: 2016-06-25 18:20:41 +0200 (Sat, 25 Jun 2016) Log Message: --- hdf5 libs for osx 10.+ Modified Paths: -- trunk/lib/darwin-9.x.universal/alembic/lib/static/libAlembicAbc.a trunk/lib/darwin-9.x.universal/alembic/lib/static/libAlembicAbcCollection.a trunk/lib/darwin-9.x.universal/alembic/lib/static/libAlembicAbcCoreAbstract.a trunk/lib/darwin-9.x.universal/alembic/lib/static/libAlembicAbcCoreFactory.a trunk/lib/darwin-9.x.universal/alembic/lib/static/libAlembicAbcCoreOgawa.a trunk/lib/darwin-9.x.universal/alembic/lib/static/libAlembicAbcGeom.a trunk/lib/darwin-9.x.universal/alembic/lib/static/libAlembicAbcMaterial.a trunk/lib/darwin-9.x.universal/alembic/lib/static/libAlembicOgawa.a trunk/lib/darwin-9.x.universal/alembic/lib/static/libAlembicUtil.a Added Paths: --- trunk/lib/darwin-9.x.universal/hdf5/ trunk/lib/darwin-9.x.universal/hdf5/include/ trunk/lib/darwin-9.x.universal/hdf5/include/H5ACpublic.h trunk/lib/darwin-9.x.universal/hdf5/include/H5Apublic.h trunk/lib/darwin-9.x.universal/hdf5/include/H5Cpublic.h trunk/lib/darwin-9.x.universal/hdf5/include/H5DOpublic.h trunk/lib/darwin-9.x.universal/hdf5/include/H5DSpublic.h trunk/lib/darwin-9.x.universal/hdf5/include/H5Dpublic.h trunk/lib/darwin-9.x.universal/hdf5/include/H5Epubgen.h trunk/lib/darwin-9.x.universal/hdf5/include/H5Epublic.h trunk/lib/darwin-9.x.universal/hdf5/include/H5FDcore.h trunk/lib/darwin-9.x.universal/hdf5/include/H5FDdirect.h trunk/lib/darwin-9.x.universal/hdf5/include/H5FDfamily.h trunk/lib/darwin-9.x.universal/hdf5/include/H5FDlog.h trunk/lib/darwin-9.x.universal/hdf5/include/H5FDmpi.h trunk/lib/darwin-9.x.universal/hdf5/include/H5FDmpio.h trunk/lib/darwin-9.x.universal/hdf5/include/H5FDmulti.h trunk/lib/darwin-9.x.universal/hdf5/include/H5FDpublic.h trunk/lib/darwin-9.x.universal/hdf5/include/H5FDsec2.h trunk/lib/darwin-9.x.universal/hdf5/include/H5FDstdio.h trunk/lib/darwin-9.x.universal/hdf5/include/H5Fpublic.h trunk/lib/darwin-9.x.universal/hdf5/include/H5Gpublic.h trunk/lib/darwin-9.x.universal/hdf5/include/H5IMpublic.h trunk/lib/darwin-9.x.universal/hdf5/include/H5Ipublic.h trunk/lib/darwin-9.x.universal/hdf5/include/H5LTpublic.h trunk/lib/darwin-9.x.universal/hdf5/include/H5Lpublic.h trunk/lib/darwin-9.x.universal/hdf5/include/H5MMpublic.h trunk/lib/darwin-9.x.universal/hdf5/include/H5Opublic.h trunk/lib/darwin-9.x.universal/hdf5/include/H5PLextern.h trunk/lib/darwin-9.x.universal/hdf5/include/H5PLpublic.h trunk/lib/darwin-9.x.universal/hdf5/include/H5PTpublic.h trunk/lib/darwin-9.x.universal/hdf5/include/H5Ppublic.h trunk/lib/darwin-9.x.universal/hdf5/include/H5Rpublic.h trunk/lib/darwin-9.x.universal/hdf5/include/H5Spublic.h trunk/lib/darwin-9.x.universal/hdf5/include/H5TBpublic.h trunk/lib/darwin-9.x.universal/hdf5/include/H5Tpublic.h trunk/lib/darwin-9.x.universal/hdf5/include/H5Zpublic.h trunk/lib/darwin-9.x.universal/hdf5/include/H5api_adpt.h trunk/lib/darwin-9.x.universal/hdf5/include/H5overflow.h trunk/lib/darwin-9.x.universal/hdf5/include/H5pubconf.h trunk/lib/darwin-9.x.universal/hdf5/include/H5public.h trunk/lib/darwin-9.x.universal/hdf5/include/H5version.h trunk/lib/darwin-9.x.universal/hdf5/include/hdf5.h trunk/lib/darwin-9.x.universal/hdf5/include/hdf5_hl.h trunk/lib/darwin-9.x.universal/hdf5/lib/ trunk/lib/darwin-9.x.universal/hdf5/lib/libhdf5.a trunk/lib/darwin-9.x.universal/hdf5/lib/libhdf5.la trunk/lib/darwin-9.x.universal/hdf5/lib/libhdf5.settings trunk/lib/darwin-9.x.universal/hdf5/lib/libhdf5_hl.a trunk/lib/darwin-9.x.universal/hdf5/lib/libhdf5_hl.la Modified: trunk/lib/darwin-9.x.universal/alembic/lib/static/libAlembicAbc.a === (Binary files differ) Modified: trunk/lib/darwin-9.x.universal/alembic/lib/static/libAlembicAbcCollection.a === (Binary files differ) Modified: trunk/lib/darwin-9.x.universal/alembic/lib/static/libAlembicAbcCoreAbstract.a === (Binary files differ) Modified: trunk/lib/darwin-9.x.universal/alembic/lib/static/libAlembicAbcCoreFactory.a === (Binary files differ) Modified: trunk/lib/darwin-9.x.universal/alembic/lib/static/libAlembicAbcCoreOgawa.a === (Binary files differ) Modified: trunk/lib/darwin-9.x.universal/alembic/lib/static/libAlembicAbcGeom.a === (Binary files differ) Modified:
[Bf-blender-cvs] [28dbd57] master: Exclude obsolete static pythonlibs from install
Commit: 28dbd572a4675f86e2d8363e88b9556170204a61
Author: Jens Verwiebe
Date: Sat Jun 25 12:39:47 2016 +0200
Branches: master
https://developer.blender.org/rB28dbd572a4675f86e2d8363e88b9556170204a61
Exclude obsolete static pythonlibs from install
===
M source/creator/CMakeLists.txt
===
diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt
index 122c10e..a4a516e 100644
--- a/source/creator/CMakeLists.txt
+++ b/source/creator/CMakeLists.txt
@@ -538,6 +538,7 @@ if(UNIX AND NOT APPLE)
DIRECTORY
${PYTHON_LIBPATH}/python${PYTHON_VERSION}
DESTINATION
${TARGETDIR_VER}/python/${_target_LIB}
PATTERN "__pycache__" EXCLUDE # *
any cache *
+ PATTERN "config-${PYTHON_VERSION}m/*.a" EXCLUDE
# static lib
PATTERN "lib2to3" EXCLUDE #
./lib2to3
PATTERN "site-packages/*" EXCLUDE #
./site-packages/*
PATTERN "tkinter" EXCLUDE #
./tkinter
@@ -914,6 +915,7 @@ elseif(APPLE)
PATTERN "__pycache__" EXCLUDE
PATTERN "__MACOSX" EXCLUDE
PATTERN ".DS_Store" EXCLUDE
+ PATTERN "config-${PYTHON_VERSION}m/*.a" EXCLUDE #
static lib
)
endmacro()
___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] [fdcab12] compositor-2016: Fix Playercompile
Commit: fdcab12f8628212142285407600bb85f2181fa90 Author: Jens Verwiebe Date: Fri Jun 3 12:03:53 2016 +0200 Branches: compositor-2016 https://developer.blender.org/rBfdcab12f8628212142285407600bb85f2181fa90 Fix Playercompile === M source/blenderplayer/bad_level_call_stubs/stubs.c === diff --git a/source/blenderplayer/bad_level_call_stubs/stubs.c b/source/blenderplayer/bad_level_call_stubs/stubs.c index 9034009..95abfdc 100644 --- a/source/blenderplayer/bad_level_call_stubs/stubs.c +++ b/source/blenderplayer/bad_level_call_stubs/stubs.c @@ -530,6 +530,7 @@ SnapObjectContext *ED_transform_snap_object_context_create_view3d( void ED_transform_snap_object_context_destroy(SnapObjectContext *sctx) RET_NONE bool ED_transform_snap_object_project_ray_ex( struct SnapObjectContext *sctx, +const unsigned short snap_to, const struct SnapObjectParams *params, const float ray_start[3], const float ray_normal[3], float *ray_depth, /* return args */ ___ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org https://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] [47048ea] alembic_basic_io: Fix missing include in cmake after adding mem_guardalloc
Commit: 47048ea3321186a68f3b5482c7e0c13dcac83d89 Author: Jens Verwiebe Date: Wed Jun 8 18:01:00 2016 +0200 Branches: alembic_basic_io https://developer.blender.org/rB47048ea3321186a68f3b5482c7e0c13dcac83d89 Fix missing include in cmake after adding mem_guardalloc === M source/blender/editors/io/CMakeLists.txt === diff --git a/source/blender/editors/io/CMakeLists.txt b/source/blender/editors/io/CMakeLists.txt index 055f3e3..dfe344c 100644 --- a/source/blender/editors/io/CMakeLists.txt +++ b/source/blender/editors/io/CMakeLists.txt @@ -29,6 +29,7 @@ set(INC ../../windowmanager ../../collada ../../alembic + ../../../../intern/guardedalloc ) set(INC_SYS ___ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org https://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] [3981804] master: Fix Playercompile
Commit: 398180439be338dc05fcd07d42974eac77880e22 Author: Jens Verwiebe Date: Fri Jun 3 12:03:53 2016 +0200 Branches: master https://developer.blender.org/rB398180439be338dc05fcd07d42974eac77880e22 Fix Playercompile === M source/blenderplayer/bad_level_call_stubs/stubs.c === diff --git a/source/blenderplayer/bad_level_call_stubs/stubs.c b/source/blenderplayer/bad_level_call_stubs/stubs.c index 9034009..95abfdc 100644 --- a/source/blenderplayer/bad_level_call_stubs/stubs.c +++ b/source/blenderplayer/bad_level_call_stubs/stubs.c @@ -530,6 +530,7 @@ SnapObjectContext *ED_transform_snap_object_context_create_view3d( void ED_transform_snap_object_context_destroy(SnapObjectContext *sctx) RET_NONE bool ED_transform_snap_object_project_ray_ex( struct SnapObjectContext *sctx, +const unsigned short snap_to, const struct SnapObjectParams *params, const float ray_start[3], const float ray_normal[3], float *ray_depth, /* return args */ ___ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org https://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] SVN commit: /data/svn/repos/bf-blender [61520] trunk/lib/ darwin-9.x.universal/opencollada/lib: OSX/collada: fix compiling on older osx sdk-versions
Revision: 61520 https://developer.blender.org/rBL61520 Author: jensverwiebe Date: 2015-05-13 13:20:58 + (Wed, 13 May 2015) Log Message: --- OSX/collada: fix compiling on older osx sdk-versions Modified Paths: -- trunk/lib/darwin-9.x.universal/opencollada/lib/libGeneratedSaxParser.a trunk/lib/darwin-9.x.universal/opencollada/lib/libMathMLSolver.a trunk/lib/darwin-9.x.universal/opencollada/lib/libOpenCOLLADABaseUtils.a trunk/lib/darwin-9.x.universal/opencollada/lib/libOpenCOLLADAFramework.a trunk/lib/darwin-9.x.universal/opencollada/lib/libOpenCOLLADASaxFrameworkLoader.a trunk/lib/darwin-9.x.universal/opencollada/lib/libOpenCOLLADAStreamWriter.a trunk/lib/darwin-9.x.universal/opencollada/lib/libUTF.a trunk/lib/darwin-9.x.universal/opencollada/lib/libbuffer.a trunk/lib/darwin-9.x.universal/opencollada/lib/libftoa.a trunk/lib/darwin-9.x.universal/opencollada/lib/libpcre.a Modified: trunk/lib/darwin-9.x.universal/opencollada/lib/libGeneratedSaxParser.a === (Binary files differ) Modified: trunk/lib/darwin-9.x.universal/opencollada/lib/libMathMLSolver.a === (Binary files differ) Modified: trunk/lib/darwin-9.x.universal/opencollada/lib/libOpenCOLLADABaseUtils.a === (Binary files differ) Modified: trunk/lib/darwin-9.x.universal/opencollada/lib/libOpenCOLLADAFramework.a === (Binary files differ) Modified: trunk/lib/darwin-9.x.universal/opencollada/lib/libOpenCOLLADASaxFrameworkLoader.a === (Binary files differ) Modified: trunk/lib/darwin-9.x.universal/opencollada/lib/libOpenCOLLADAStreamWriter.a === (Binary files differ) Modified: trunk/lib/darwin-9.x.universal/opencollada/lib/libUTF.a === (Binary files differ) Modified: trunk/lib/darwin-9.x.universal/opencollada/lib/libbuffer.a === (Binary files differ) Modified: trunk/lib/darwin-9.x.universal/opencollada/lib/libftoa.a === (Binary files differ) Modified: trunk/lib/darwin-9.x.universal/opencollada/lib/libpcre.a === (Binary files differ) ___ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org http://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] [23abcc0] master: OSX: remove collada from fading out 32bit buildbot
Commit: 23abcc0636135c83cfb91782f7030ea41482e147 Author: Jens Verwiebe Date: Fri May 1 21:09:21 2015 +0200 Branches: master https://developer.blender.org/rB23abcc0636135c83cfb91782f7030ea41482e147 OSX: remove collada from fading out 32bit buildbot === M build_files/buildbot/config/user-config-mac-i386.py === diff --git a/build_files/buildbot/config/user-config-mac-i386.py b/build_files/buildbot/config/user-config-mac-i386.py index ab93628..c1beefc 100644 --- a/build_files/buildbot/config/user-config-mac-i386.py +++ b/build_files/buildbot/config/user-config-mac-i386.py @@ -5,3 +5,5 @@ WITH_BF_CYCLES_CUDA_BINARIES = True WITH_BF_CYCLES_OSL = False # OSL never worked on OSX 32bit ! +WITH_BF_COLLADA = False # we drop 32bit, newest collada is only x86_64 ! + ___ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org http://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] SVN commit: /data/svn/repos/bf-blender [61516] trunk/lib/ darwin-9.x.universal/opencollada: OSX/Collada: update to git rev 3335ac164e68b2512a40914b14c74db260e6ff7d, 64bit only
Revision: 61516
https://developer.blender.org/rBL61516
Author: jensverwiebe
Date: 2015-05-01 19:08:10 + (Fri, 01 May 2015)
Log Message:
---
OSX/Collada: update to git rev 3335ac164e68b2512a40914b14c74db260e6ff7d, 64bit
only
Modified Paths:
--
trunk/lib/darwin-9.x.universal/opencollada/README.rtf
trunk/lib/darwin-9.x.universal/opencollada/include/COLLADABaseUtils/COLLADABUPlatform.h
trunk/lib/darwin-9.x.universal/opencollada/include/COLLADABaseUtils/COLLADABUhash_map.h
trunk/lib/darwin-9.x.universal/opencollada/include/COLLADAFramework/COLLADAFWEffectCommon.h
trunk/lib/darwin-9.x.universal/opencollada/include/COLLADAFramework/COLLADAFWFileInfo.h
trunk/lib/darwin-9.x.universal/opencollada/include/COLLADAFramework/COLLADAFWInstanceBindingBase.h
trunk/lib/darwin-9.x.universal/opencollada/include/COLLADAFramework/COLLADAFWMeshPrimitiveWithFaceVertexCount.h
trunk/lib/darwin-9.x.universal/opencollada/include/COLLADAFramework/COLLADAFWSampler.h
trunk/lib/darwin-9.x.universal/opencollada/include/COLLADAFramework/COLLADAFWTechnique.h
trunk/lib/darwin-9.x.universal/opencollada/include/COLLADAFramework/COLLADAFWValidate.h
trunk/lib/darwin-9.x.universal/opencollada/include/COLLADASaxFrameworkLoader/COLLADASaxFWLLibraryAnimationsLoader.h
trunk/lib/darwin-9.x.universal/opencollada/include/COLLADASaxFrameworkLoader/COLLADASaxFWLLibraryControllersLoader.h
trunk/lib/darwin-9.x.universal/opencollada/include/COLLADASaxFrameworkLoader/COLLADASaxFWLLibraryEffectsLoader.h
trunk/lib/darwin-9.x.universal/opencollada/include/COLLADASaxFrameworkLoader/COLLADASaxFWLLoader.h
trunk/lib/darwin-9.x.universal/opencollada/include/COLLADASaxFrameworkLoader/generated15/COLLADASaxFWLFormulasLoader15.h
trunk/lib/darwin-9.x.universal/opencollada/include/COLLADASaxFrameworkLoader/generated15/COLLADASaxFWLLibraryArticulatedSystemsLoader15.h
trunk/lib/darwin-9.x.universal/opencollada/include/COLLADASaxFrameworkLoader/generated15/COLLADASaxFWLLibraryKinematicsScenesLoader15.h
trunk/lib/darwin-9.x.universal/opencollada/include/COLLADAStreamWriter/COLLADASWExtraTechnique.h
trunk/lib/darwin-9.x.universal/opencollada/include/COLLADAStreamWriter/COLLADASWInstanceGeometry.h
trunk/lib/darwin-9.x.universal/opencollada/lib/libGeneratedSaxParser.a
trunk/lib/darwin-9.x.universal/opencollada/lib/libMathMLSolver.a
trunk/lib/darwin-9.x.universal/opencollada/lib/libOpenCOLLADABaseUtils.a
trunk/lib/darwin-9.x.universal/opencollada/lib/libOpenCOLLADAFramework.a
trunk/lib/darwin-9.x.universal/opencollada/lib/libOpenCOLLADASaxFrameworkLoader.a
trunk/lib/darwin-9.x.universal/opencollada/lib/libOpenCOLLADAStreamWriter.a
trunk/lib/darwin-9.x.universal/opencollada/lib/libUTF.a
trunk/lib/darwin-9.x.universal/opencollada/lib/libbuffer.a
trunk/lib/darwin-9.x.universal/opencollada/lib/libftoa.a
trunk/lib/darwin-9.x.universal/opencollada/lib/libpcre.a
Modified: trunk/lib/darwin-9.x.universal/opencollada/README.rtf
===
--- trunk/lib/darwin-9.x.universal/opencollada/README.rtf 2015-04-29
20:24:31 UTC (rev 61515)
+++ trunk/lib/darwin-9.x.universal/opencollada/README.rtf 2015-05-01
19:08:10 UTC (rev 61516)
@@ -1,12 +1,14 @@
-{\rtf1\ansi\ansicpg1252\cocoartf1187\cocoasubrtf390
-{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
+{\rtf1\ansi\ansicpg1252\cocoartf1347\cocoasubrtf570
+{\fonttbl\f0\fswiss\fcharset0 Helvetica;\f1\fnil\fcharset0 Menlo-Regular;}
{\colortbl;\red255\green255\blue255;}
\paperw11900\paperh16840\margl1440\margr1440\vieww18660\viewh9160\viewkind0
\deftab720
\pard\pardeftab720
-\f0\fs24 \cf0 git rev 828b60384552b83e55d2af7055f07d2c40b4d3f4\
-\pard\tx566\tx1133\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\pardirnatural
+\f0\fs24 \cf0 git rev
+\f1 \CocoaLigature0 3335ac164e68b2512a40914b14c74db260e6ff7d
+\f0 \CocoaLigature1 \
+\pard\tx566\tx1133\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\pardeftab720\pardirnatural
\cf0 \
I compiled this time using xcode/clang\
\
Modified:
trunk/lib/darwin-9.x.universal/opencollada/include/COLLADABaseUtils/COLLADABUPlatform.h
===
---
trunk/lib/darwin-9.x.universal/opencollada/include/COLLADABaseUtils/COLLADABUPlatform.h
2015-04-29 20:24:31 UTC (rev 61515)
+++
trunk/lib/darwin-9.x.universal/opencollada/include/COLLADABaseUtils/COLLADABUPlatform.h
2015-05-01 19:08:10 UTC (rev 61516)
@@ -23,7 +23,7 @@
# define COLLADABU_OS_WIN64
#elif (defined(WIN32) || defined(_WIN32) || defined(__WIN32__) ||
defined(__NT__))
# define COLLADABU_OS_WIN32
-#elif defined(__linux__) || defined(__linux)
+#elif defined(__linux__) || defined(__linux) || defined(__FreeBSD__)
# define COLLADABU_OS_LINUX
#endif
Modified:
[Bf-blender-cvs] [ce32aae] master: OSX: fix T44533, system_bookmarks not showing utf standard ( umlauts etc. )
Commit: ce32aae80c5c00ec33a86528a93809c66f819c5c Author: Jens Verwiebe Date: Wed Apr 29 20:07:38 2015 +0200 Branches: master https://developer.blender.org/rBce32aae80c5c00ec33a86528a93809c66f819c5c OSX: fix T44533, system_bookmarks not showing utf standard ( umlauts etc. ) === M source/blender/editors/space_file/fsmenu.c === diff --git a/source/blender/editors/space_file/fsmenu.c b/source/blender/editors/space_file/fsmenu.c index c6ee687..fdf7b45 100644 --- a/source/blender/editors/space_file/fsmenu.c +++ b/source/blender/editors/space_file/fsmenu.c @@ -565,7 +565,7 @@ void fsmenu_read_system(struct FSMenu *fsmenu, int read_bookmarks) pathString = CFURLCopyFileSystemPath(cfURL, kCFURLPOSIXPathStyle); - if (pathString == NULL || !CFStringGetCString(pathString, line, sizeof(line), kCFStringEncodingASCII)) + if (pathString == NULL || !CFStringGetCString(pathString, line, sizeof(line), kCFStringEncodingUTF8)) continue; /* Exclude all my files as it makes no sense in blender fileselector */ ___ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org http://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] [2aa7967] master: OSX: add also license for iomp5 using cmake and fix all textfiles wrong destination
Commit: 2aa79679dca564b47f5db868160508adba9e08ca
Author: Jens Verwiebe
Date: Mon Apr 6 19:55:51 2015 +0200
Branches: master
https://developer.blender.org/rB2aa79679dca564b47f5db868160508adba9e08ca
OSX: add also license for iomp5 using cmake and fix all textfiles wrong
destination
===
M source/creator/CMakeLists.txt
===
diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt
index 193737e..c0b0c2e 100644
--- a/source/creator/CMakeLists.txt
+++ b/source/creator/CMakeLists.txt
@@ -843,7 +843,7 @@ elseif(APPLE)
)
# install release and app files
- set(BLENDER_TEXT_FILES_DESTINATION blender.app/Contents)
+ set(BLENDER_TEXT_FILES_DESTINATION .)
install(
FILES ${OSX_APP_SOURCEDIR}/Contents/PkgInfo
@@ -860,6 +860,11 @@ elseif(APPLE)
FILES ${LIBDIR}/openmp/lib/libiomp5.dylib
DESTINATION blender.app/Contents/Resources/lib/
)
+ install(
+ FILES ${LIBDIR}/openmp/LICENSE.txt
+ DESTINATION .
+ RENAME LICENSE-libiomp5.txt
+ )
endif()
if(WITH_LLVM AND NOT LLVM_STATIC)
___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] [28e9058] master: OSX: add a license file for libiomp5 ( intel omp ) when compiled with
Commit: 28e9058e7ad29844c111e02fd1b44c9fc57a9b1f Author: Jens Verwiebe Date: Mon Apr 6 19:12:23 2015 +0200 Branches: master https://developer.blender.org/rB28e9058e7ad29844c111e02fd1b44c9fc57a9b1f OSX: add a license file for libiomp5 ( intel omp ) when compiled with === M build_files/scons/tools/Blender.py === diff --git a/build_files/scons/tools/Blender.py b/build_files/scons/tools/Blender.py index dbe1caf..e751be3 100644 --- a/build_files/scons/tools/Blender.py +++ b/build_files/scons/tools/Blender.py @@ -816,6 +816,8 @@ def AppIt(target=None, source=None, env=None): instname = env['LCGDIR'][1:] # made libiomp5 part of blender libs cmd = 'ditto --arch %s %s/openmp/lib/libiomp5.dylib %s/%s.app/Contents/Resources/lib/'%(osxarch, instname, installdir, binary) # copy libiomp5 commands.getoutput(cmd) +cmd = 'cp %s/openmp/LICENSE.txt %s/LICENSE-libiomp5.txt'%(instname, installdir) # copy libiomp5 license +commands.getoutput(cmd) # extract copy system python, be sure to update other build systems # when making changes to the files that are copied. ___ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org http://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] [44a4b90] master: Fix collada compile after BKE cleanup
Commit: 44a4b90b4f303912390f5f846c1882ef37d975d1 Author: Jens Verwiebe Date: Sat Mar 28 18:17:54 2015 +0100 Branches: master https://developer.blender.org/rB44a4b90b4f303912390f5f846c1882ef37d975d1 Fix collada compile after BKE cleanup === M source/blender/collada/DocumentImporter.cpp === diff --git a/source/blender/collada/DocumentImporter.cpp b/source/blender/collada/DocumentImporter.cpp index 462b7b6..0aff514 100644 --- a/source/blender/collada/DocumentImporter.cpp +++ b/source/blender/collada/DocumentImporter.cpp @@ -771,9 +771,9 @@ MTex *DocumentImporter::create_texture(COLLADAFW::EffectCommon *ef, COLLADAFW::T return NULL; } - ma-mtex[i] = add_mtex(); + ma-mtex[i] = BKE_texture_mtex_add(); ma-mtex[i]-texco = TEXCO_UV; - ma-mtex[i]-tex = add_texture(G.main, Texture); + ma-mtex[i]-tex = BKE_texture_add(G.main, Texture); ma-mtex[i]-tex-type = TEX_IMAGE; ma-mtex[i]-tex-ima = uid_image_map[ima_uid]; ___ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org http://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] [30e06a1] blender-v2.74-release: Fix 2 typos ( shakin' hands )
Commit: 30e06a1775b07e867682d4ceeff8338b1e833ea3 Author: Jens Verwiebe Date: Wed Mar 25 16:56:43 2015 +0100 Branches: blender-v2.74-release https://developer.blender.org/rB30e06a1775b07e867682d4ceeff8338b1e833ea3 Fix 2 typos ( shakin' hands ) === M intern/cycles/kernel/kernel_shader.h === diff --git a/intern/cycles/kernel/kernel_shader.h b/intern/cycles/kernel/kernel_shader.h index dfa3121..c6bf12d 100644 --- a/intern/cycles/kernel/kernel_shader.h +++ b/intern/cycles/kernel/kernel_shader.h @@ -800,8 +800,8 @@ ccl_device void shader_eval_surface(KernelGlobals *kg, ShaderData *sd, #else sd-closure-weight = make_float3(0.8f, 0.8f, 0.8f); sd-closure-N = sd-N; - sd-closyre-data0 = 0.0f; - sd-closyre-data1 = 0.0f; + sd-closure-data0 = 0.0f; + sd-closure-data1 = 0.0f; sd-flag |= bsdf_diffuse_setup(sd-closure); #endif } ___ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org http://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] [f80064f] master: Fix compiling after sound changes
Commit: f80064f2d24408aa85c84f3c328ef470baf39e7c
Author: Jens Verwiebe
Date: Thu Mar 26 13:19:33 2015 +0100
Branches: master
https://developer.blender.org/rBf80064f2d24408aa85c84f3c328ef470baf39e7c
Fix compiling after sound changes
===
M source/blender/blenkernel/intern/sound.c
M source/blender/makesrna/intern/rna_userdef.c
===
diff --git a/source/blender/blenkernel/intern/sound.c
b/source/blender/blenkernel/intern/sound.c
index 4d14b2f..6a831d2 100644
--- a/source/blender/blenkernel/intern/sound.c
+++ b/source/blender/blenkernel/intern/sound.c
@@ -141,9 +141,9 @@ static void sound_sync_callback(void *data, int mode, float
time)
while (scene) {
if (scene-audio.flag AUDIO_SYNC) {
if (mode)
- sound_play_scene(scene);
+ BKE_sound_play_scene(scene);
else
- sound_stop_scene(scene);
+ BKE_sound_stop_scene(scene);
if (scene-sound_scene_handle)
AUD_seek(scene-sound_scene_handle, time);
}
diff --git a/source/blender/makesrna/intern/rna_userdef.c
b/source/blender/makesrna/intern/rna_userdef.c
index beb5ae7..15a4ef5 100644
--- a/source/blender/makesrna/intern/rna_userdef.c
+++ b/source/blender/makesrna/intern/rna_userdef.c
@@ -548,7 +548,7 @@ static EnumPropertyItem
*rna_userdef_audio_device_itemf(bContext *UNUSED(C), Poi
#endif
#ifdef WITH_JACK
- if (sound_is_jack_supported()) {
+ if (BKE_sound_is_jack_supported()) {
RNA_enum_item_add(item, totitem, audio_device_items[index]);
}
index++;
___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] [9fc1a29] master: Fix 2 typos ( shakin' hands )
Commit: 9fc1a29de35bd9ac453884d106ec5694539f989e Author: Jens Verwiebe Date: Wed Mar 25 16:56:43 2015 +0100 Branches: master https://developer.blender.org/rB9fc1a29de35bd9ac453884d106ec5694539f989e Fix 2 typos ( shakin' hands ) === M intern/cycles/kernel/kernel_shader.h === diff --git a/intern/cycles/kernel/kernel_shader.h b/intern/cycles/kernel/kernel_shader.h index 17e5db9..71b2f74 100644 --- a/intern/cycles/kernel/kernel_shader.h +++ b/intern/cycles/kernel/kernel_shader.h @@ -798,8 +798,8 @@ ccl_device void shader_eval_surface(KernelGlobals *kg, ShaderData *sd, #else sd-closure-weight = make_float3(0.8f, 0.8f, 0.8f); sd-closure-N = sd-N; - sd-closyre-data0 = 0.0f; - sd-closyre-data1 = 0.0f; + sd-closure-data0 = 0.0f; + sd-closure-data1 = 0.0f; sd-flag |= bsdf_diffuse_setup(sd-closure); #endif } ___ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org http://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] [3cf120b] blender-v2.74-release: OSX: fix 1 leak ( found and fixed by marcclintdion ) and 1 possible leak in dragndrop, backport to 2.74
Commit: 3cf120be6764e4c7bb04a84f19cd0806a9cdeec0
Author: Jens Verwiebe
Date: Sun Mar 22 19:29:31 2015 +0100
Branches: blender-v2.74-release
https://developer.blender.org/rB3cf120be6764e4c7bb04a84f19cd0806a9cdeec0
OSX: fix 1 leak ( found and fixed by marcclintdion ) and 1 possible leak in
dragndrop, backport to 2.74
===
M intern/ghost/intern/GHOST_EventDragnDrop.h
M intern/ghost/intern/GHOST_SystemCocoa.mm
===
diff --git a/intern/ghost/intern/GHOST_EventDragnDrop.h
b/intern/ghost/intern/GHOST_EventDragnDrop.h
index c51f956..b7bf37c 100644
--- a/intern/ghost/intern/GHOST_EventDragnDrop.h
+++ b/intern/ghost/intern/GHOST_EventDragnDrop.h
@@ -112,6 +112,7 @@ public:
for (i = 0; i strArray-count; i++)
free(strArray-strings[i]);
+ free(strArray-strings);
free(strArray);
}
break;
diff --git a/intern/ghost/intern/GHOST_SystemCocoa.mm
b/intern/ghost/intern/GHOST_SystemCocoa.mm
index 095c738..ed1200b 100644
--- a/intern/ghost/intern/GHOST_SystemCocoa.mm
+++ b/intern/ghost/intern/GHOST_SystemCocoa.mm
@@ -882,7 +882,10 @@ GHOST_TSuccess
GHOST_SystemCocoa::handleDraggingEvent(GHOST_TEventType eventType
if (!strArray) return GHOST_kFailure;
strArray-count = [droppedArray count];
- if (strArray-count == 0) return
GHOST_kFailure;
+ if (strArray-count == 0) {
+ free(strArray);
+ return GHOST_kFailure;
+ }
strArray-strings = (GHOST_TUns8**)
malloc(strArray-count*sizeof(GHOST_TUns8*));
___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] [d22c568] blender-v2.74-release: OSX/GHOST: need one more release in error case
Commit: d22c56819cd5ded2e693d1fec4934a99d2b5d659 Author: Jens Verwiebe Date: Sat Mar 21 17:15:38 2015 +0100 Branches: blender-v2.74-release https://developer.blender.org/rBd22c56819cd5ded2e693d1fec4934a99d2b5d659 OSX/GHOST: need one more release in error case === M intern/ghost/intern/GHOST_ContextCGL.mm === diff --git a/intern/ghost/intern/GHOST_ContextCGL.mm b/intern/ghost/intern/GHOST_ContextCGL.mm index cf94dc8..ae7e7a6 100644 --- a/intern/ghost/intern/GHOST_ContextCGL.mm +++ b/intern/ghost/intern/GHOST_ContextCGL.mm @@ -334,6 +334,7 @@ GHOST_TSuccess GHOST_ContextCGL::initializeDrawingContext() error: [m_openGLView setOpenGLContext:prev_openGLContext]; + [pixelFormat release]; [pool drain]; ___ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org http://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] [ff455f1] blender-v2.74-release: Partly fix T44025, pixelFormat retain was left, for 2.74 backport
Commit: ff455f1ae1ff5c309aca6b53fca361b48f3e81a1 Author: Jens Verwiebe Date: Fri Mar 20 17:57:35 2015 +0100 Branches: blender-v2.74-release https://developer.blender.org/rBff455f1ae1ff5c309aca6b53fca361b48f3e81a1 Partly fix T44025, pixelFormat retain was left, for 2.74 backport === M intern/ghost/intern/GHOST_ContextCGL.mm === diff --git a/intern/ghost/intern/GHOST_ContextCGL.mm b/intern/ghost/intern/GHOST_ContextCGL.mm index 0b290c6..cf94dc8 100644 --- a/intern/ghost/intern/GHOST_ContextCGL.mm +++ b/intern/ghost/intern/GHOST_ContextCGL.mm @@ -292,14 +292,16 @@ GHOST_TSuccess GHOST_ContextCGL::initializeDrawingContext() [m_openGLView setPixelFormat:pixelFormat]; - m_openGLContext = [[NSOpenGLContext alloc] initWithFormat:pixelFormat shareContext:s_sharedOpenGLContext]; + m_openGLContext = [[NSOpenGLContext alloc] initWithFormat:pixelFormat shareContext:s_sharedOpenGLContext]; // +1 refCount to pixelFormat if (m_openGLContext == nil) goto error; if (s_sharedCount == 0) s_sharedOpenGLContext = m_openGLContext; - + + [pixelFormat release]; // -1 refCount to pixelFormat + s_sharedCount++; #ifdef GHOST_MULTITHREADED_OPENGL ___ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org http://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] [059d5bc] master: OSX: fix 1 leak ( found and fixed by marcclintdion ) and 1 possible leak in dragndrop, backport to 2.74
Commit: 059d5bc80988320dca9cc2797d7bddc75ba0b82f
Author: Jens Verwiebe
Date: Sun Mar 22 19:29:31 2015 +0100
Branches: master
https://developer.blender.org/rB059d5bc80988320dca9cc2797d7bddc75ba0b82f
OSX: fix 1 leak ( found and fixed by marcclintdion ) and 1 possible leak in
dragndrop, backport to 2.74
===
M intern/ghost/intern/GHOST_EventDragnDrop.h
M intern/ghost/intern/GHOST_SystemCocoa.mm
===
diff --git a/intern/ghost/intern/GHOST_EventDragnDrop.h
b/intern/ghost/intern/GHOST_EventDragnDrop.h
index c51f956..b7bf37c 100644
--- a/intern/ghost/intern/GHOST_EventDragnDrop.h
+++ b/intern/ghost/intern/GHOST_EventDragnDrop.h
@@ -112,6 +112,7 @@ public:
for (i = 0; i strArray-count; i++)
free(strArray-strings[i]);
+ free(strArray-strings);
free(strArray);
}
break;
diff --git a/intern/ghost/intern/GHOST_SystemCocoa.mm
b/intern/ghost/intern/GHOST_SystemCocoa.mm
index 095c738..ed1200b 100644
--- a/intern/ghost/intern/GHOST_SystemCocoa.mm
+++ b/intern/ghost/intern/GHOST_SystemCocoa.mm
@@ -882,7 +882,10 @@ GHOST_TSuccess
GHOST_SystemCocoa::handleDraggingEvent(GHOST_TEventType eventType
if (!strArray) return GHOST_kFailure;
strArray-count = [droppedArray count];
- if (strArray-count == 0) return
GHOST_kFailure;
+ if (strArray-count == 0) {
+ free(strArray);
+ return GHOST_kFailure;
+ }
strArray-strings = (GHOST_TUns8**)
malloc(strArray-count*sizeof(GHOST_TUns8*));
___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] [8e9c9fd] master: OSX/GHOST: need one more release in error case
Commit: 8e9c9fde427c228111cfe2da6dfac9e54abb2a3d Author: Jens Verwiebe Date: Sat Mar 21 17:15:38 2015 +0100 Branches: master https://developer.blender.org/rB8e9c9fde427c228111cfe2da6dfac9e54abb2a3d OSX/GHOST: need one more release in error case === M intern/ghost/intern/GHOST_ContextCGL.mm === diff --git a/intern/ghost/intern/GHOST_ContextCGL.mm b/intern/ghost/intern/GHOST_ContextCGL.mm index cf94dc8..ae7e7a6 100644 --- a/intern/ghost/intern/GHOST_ContextCGL.mm +++ b/intern/ghost/intern/GHOST_ContextCGL.mm @@ -334,6 +334,7 @@ GHOST_TSuccess GHOST_ContextCGL::initializeDrawingContext() error: [m_openGLView setOpenGLContext:prev_openGLContext]; + [pixelFormat release]; [pool drain]; ___ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org http://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] [0582aa6] master: Partly fix T44025, pixelFormat retain was left, for 2.74 backport
Commit: 0582aa6f130a4b1182fc5db646db3c7ac4a8ca46 Author: Jens Verwiebe Date: Fri Mar 20 17:57:35 2015 +0100 Branches: master https://developer.blender.org/rB0582aa6f130a4b1182fc5db646db3c7ac4a8ca46 Partly fix T44025, pixelFormat retain was left, for 2.74 backport === M intern/ghost/intern/GHOST_ContextCGL.mm === diff --git a/intern/ghost/intern/GHOST_ContextCGL.mm b/intern/ghost/intern/GHOST_ContextCGL.mm index 0b290c6..cf94dc8 100644 --- a/intern/ghost/intern/GHOST_ContextCGL.mm +++ b/intern/ghost/intern/GHOST_ContextCGL.mm @@ -292,14 +292,16 @@ GHOST_TSuccess GHOST_ContextCGL::initializeDrawingContext() [m_openGLView setPixelFormat:pixelFormat]; - m_openGLContext = [[NSOpenGLContext alloc] initWithFormat:pixelFormat shareContext:s_sharedOpenGLContext]; + m_openGLContext = [[NSOpenGLContext alloc] initWithFormat:pixelFormat shareContext:s_sharedOpenGLContext]; // +1 refCount to pixelFormat if (m_openGLContext == nil) goto error; if (s_sharedCount == 0) s_sharedOpenGLContext = m_openGLContext; - + + [pixelFormat release]; // -1 refCount to pixelFormat + s_sharedCount++; #ifdef GHOST_MULTITHREADED_OPENGL ___ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org http://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] [997c0c8] master: Fix indentation in last commit, tab slipped in
Commit: 997c0c837b5a4d090b124dc5a2e85b139e1ceb56 Author: Jens Verwiebe Date: Fri Mar 20 20:26:51 2015 +0100 Branches: master https://developer.blender.org/rB997c0c837b5a4d090b124dc5a2e85b139e1ceb56 Fix indentation in last commit, tab slipped in === M source/blender/gpu/SConscript === diff --git a/source/blender/gpu/SConscript b/source/blender/gpu/SConscript index 9a3ea8f..8d0ef39 100644 --- a/source/blender/gpu/SConscript +++ b/source/blender/gpu/SConscript @@ -67,7 +67,7 @@ sources.extend(( os.path.join(env['DATA_SOURCES'], gpu_shader_simple_vert.glsl.c), os.path.join(env['DATA_SOURCES'], gpu_shader_fx_ssao_frag.glsl.c), os.path.join(env['DATA_SOURCES'], gpu_shader_fx_dof_hq_frag.glsl.c), - os.path.join(env['DATA_SOURCES'], gpu_shader_fx_dof_hq_vert.glsl.c), +os.path.join(env['DATA_SOURCES'], gpu_shader_fx_dof_hq_vert.glsl.c), os.path.join(env['DATA_SOURCES'], gpu_shader_fx_dof_hq_geo.glsl.c), os.path.join(env['DATA_SOURCES'], gpu_shader_fx_dof_frag.glsl.c), os.path.join(env['DATA_SOURCES'], gpu_shader_fx_dof_vert.glsl.c), ___ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org http://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] [ed61017] master: Really fix scons with new glsl shaders
Commit: ed61017391a6d5b9d1bde39e4df95c63ec01cf05 Author: Jens Verwiebe Date: Fri Mar 20 20:24:30 2015 +0100 Branches: master https://developer.blender.org/rBed61017391a6d5b9d1bde39e4df95c63ec01cf05 Really fix scons with new glsl shaders === M source/blender/gpu/SConscript === diff --git a/source/blender/gpu/SConscript b/source/blender/gpu/SConscript index f52b39d..9a3ea8f 100644 --- a/source/blender/gpu/SConscript +++ b/source/blender/gpu/SConscript @@ -66,6 +66,9 @@ sources.extend(( os.path.join(env['DATA_SOURCES'], gpu_shader_simple_frag.glsl.c), os.path.join(env['DATA_SOURCES'], gpu_shader_simple_vert.glsl.c), os.path.join(env['DATA_SOURCES'], gpu_shader_fx_ssao_frag.glsl.c), +os.path.join(env['DATA_SOURCES'], gpu_shader_fx_dof_hq_frag.glsl.c), + os.path.join(env['DATA_SOURCES'], gpu_shader_fx_dof_hq_vert.glsl.c), +os.path.join(env['DATA_SOURCES'], gpu_shader_fx_dof_hq_geo.glsl.c), os.path.join(env['DATA_SOURCES'], gpu_shader_fx_dof_frag.glsl.c), os.path.join(env['DATA_SOURCES'], gpu_shader_fx_dof_vert.glsl.c), os.path.join(env['DATA_SOURCES'], gpu_shader_fx_depth_resolve.glsl.c), ___ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org http://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] [d1794b8] gooseberry: Fix broken force setting multisamples only once, introduced in b5b359b48f7f
Commit: d1794b897c9540ce29539edb8211109566566fa9 Author: Jens Verwiebe Date: Fri Mar 6 13:07:02 2015 +0100 Branches: gooseberry https://developer.blender.org/rBd1794b897c9540ce29539edb8211109566566fa9 Fix broken force setting multisamples only once, introduced in b5b359b48f7f === M source/blender/windowmanager/intern/wm_window.c === diff --git a/source/blender/windowmanager/intern/wm_window.c b/source/blender/windowmanager/intern/wm_window.c index cb2f728..e341e49 100644 --- a/source/blender/windowmanager/intern/wm_window.c +++ b/source/blender/windowmanager/intern/wm_window.c @@ -363,7 +363,8 @@ static void wm_window_add_ghostwindow(wmWindowManager *wm, const char *title, wm /* force setting multisamples only once, it requires restart - and you cannot * mix it, either all windows have it, or none (tested in OSX opengl) */ if (multisamples == -1) - glSettings.numOfAASamples = U.ogl_multisamples; + multisamples = U.ogl_multisamples; + glSettings.numOfAASamples = multisamples; if (!(U.uiflag2 USER_OPENGL_NO_WARN_SUPPORT)) glSettings.flags |= GHOST_glWarnSupport; ___ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org http://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] SVN commit: /data/svn/repos/bf-blender [61503] trunk/lib/ darwin-9.x.universal/boost: Add boost_program_options for alembic
Revision: 61503 https://developer.blender.org/rBL61503 Author: jensverwiebe Date: 2015-03-06 16:35:13 + (Fri, 06 Mar 2015) Log Message: --- Add boost_program_options for alembic Modified Paths: -- trunk/lib/darwin-9.x.universal/boost/build.sh Added Paths: --- trunk/lib/darwin-9.x.universal/boost/lib/libboost_program_options-mt.a Modified: trunk/lib/darwin-9.x.universal/boost/build.sh === --- trunk/lib/darwin-9.x.universal/boost/build.sh 2015-03-05 10:57:19 UTC (rev 61502) +++ trunk/lib/darwin-9.x.universal/boost/build.sh 2015-03-06 16:35:13 UTC (rev 61503) @@ -2,7 +2,7 @@ # build ./bootstrap.sh -./bjam -j8 variant=release cxxflags='-stdlib=libstdc++' link=static threading=multi architecture=x86 address-model=32_64 --macosx-version=10.9 --macosx-version-min=10.6 --with-filesystem --with-thread --with-regex --with-system --with-date_time --with-wave --with-serialization --with-locale stage -a +./bjam -j8 variant=release cxxflags='-stdlib=libstdc++' link=static threading=multi architecture=x86 address-model=32_64 --macosx-version=10.9 --macosx-version-min=10.6 --with-filesystem --with-thread --with-regex --with-system --with-date_time --with-wave --with-program_options --with-serialization --with-locale stage -a # copy files cp -rf stage/lib ../ @@ -20,4 +20,4 @@ mv ../lib/libboost_wserialization.a ../lib/libboost_wserialization-mt.a mv ../lib/libboost_locale.a ../lib/libboost_locale-mt.a mv ../lib/libboost_chrono.a ../lib/libboost_chrono-mt.a - +mv ../lib/libboost_program_options.a ../lib/libboost_program_options-mt.a \ No newline at end of file Added: trunk/lib/darwin-9.x.universal/boost/lib/libboost_program_options-mt.a === (Binary files differ) Index: trunk/lib/darwin-9.x.universal/boost/lib/libboost_program_options-mt.a === --- trunk/lib/darwin-9.x.universal/boost/lib/libboost_program_options-mt.a 2015-03-05 10:57:19 UTC (rev 61502) +++ trunk/lib/darwin-9.x.universal/boost/lib/libboost_program_options-mt.a 2015-03-06 16:35:13 UTC (rev 61503) Property changes on: trunk/lib/darwin-9.x.universal/boost/lib/libboost_program_options-mt.a ___ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property ___ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org http://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] SVN commit: /data/svn/repos/bf-blender [61504] trunk/lib/ darwin-9.x.universal/alembic: OSX:Initial commit of alembic, 10.9/10 only
Revision: 61504 https://developer.blender.org/rBL61504 Author: jensverwiebe Date: 2015-03-06 16:41:29 + (Fri, 06 Mar 2015) Log Message: --- OSX:Initial commit of alembic, 10.9/10 only Added Paths: --- trunk/lib/darwin-9.x.universal/alembic/ trunk/lib/darwin-9.x.universal/alembic/include/ trunk/lib/darwin-9.x.universal/alembic/include/Alembic/ trunk/lib/darwin-9.x.universal/alembic/include/Alembic/Abc/ trunk/lib/darwin-9.x.universal/alembic/include/Alembic/Abc/All.h trunk/lib/darwin-9.x.universal/alembic/include/Alembic/Abc/ArchiveInfo.h trunk/lib/darwin-9.x.universal/alembic/include/Alembic/Abc/Argument.h trunk/lib/darwin-9.x.universal/alembic/include/Alembic/Abc/Base.h trunk/lib/darwin-9.x.universal/alembic/include/Alembic/Abc/ErrorHandler.h trunk/lib/darwin-9.x.universal/alembic/include/Alembic/Abc/Foundation.h trunk/lib/darwin-9.x.universal/alembic/include/Alembic/Abc/IArchive.h trunk/lib/darwin-9.x.universal/alembic/include/Alembic/Abc/IArrayProperty.h trunk/lib/darwin-9.x.universal/alembic/include/Alembic/Abc/IBaseProperty.h trunk/lib/darwin-9.x.universal/alembic/include/Alembic/Abc/ICompoundProperty.h trunk/lib/darwin-9.x.universal/alembic/include/Alembic/Abc/IObject.h trunk/lib/darwin-9.x.universal/alembic/include/Alembic/Abc/ISampleSelector.h trunk/lib/darwin-9.x.universal/alembic/include/Alembic/Abc/IScalarProperty.h trunk/lib/darwin-9.x.universal/alembic/include/Alembic/Abc/ISchema.h trunk/lib/darwin-9.x.universal/alembic/include/Alembic/Abc/ISchemaObject.h trunk/lib/darwin-9.x.universal/alembic/include/Alembic/Abc/ITypedArrayProperty.h trunk/lib/darwin-9.x.universal/alembic/include/Alembic/Abc/ITypedScalarProperty.h trunk/lib/darwin-9.x.universal/alembic/include/Alembic/Abc/OArchive.h trunk/lib/darwin-9.x.universal/alembic/include/Alembic/Abc/OArrayProperty.h trunk/lib/darwin-9.x.universal/alembic/include/Alembic/Abc/OBaseProperty.h trunk/lib/darwin-9.x.universal/alembic/include/Alembic/Abc/OCompoundProperty.h trunk/lib/darwin-9.x.universal/alembic/include/Alembic/Abc/OObject.h trunk/lib/darwin-9.x.universal/alembic/include/Alembic/Abc/OScalarProperty.h trunk/lib/darwin-9.x.universal/alembic/include/Alembic/Abc/OSchema.h trunk/lib/darwin-9.x.universal/alembic/include/Alembic/Abc/OSchemaObject.h trunk/lib/darwin-9.x.universal/alembic/include/Alembic/Abc/OTypedArrayProperty.h trunk/lib/darwin-9.x.universal/alembic/include/Alembic/Abc/OTypedScalarProperty.h trunk/lib/darwin-9.x.universal/alembic/include/Alembic/Abc/Reference.h trunk/lib/darwin-9.x.universal/alembic/include/Alembic/Abc/SourceName.h trunk/lib/darwin-9.x.universal/alembic/include/Alembic/Abc/TypedArraySample.h trunk/lib/darwin-9.x.universal/alembic/include/Alembic/Abc/TypedPropertyTraits.h trunk/lib/darwin-9.x.universal/alembic/include/Alembic/AbcCollection/ trunk/lib/darwin-9.x.universal/alembic/include/Alembic/AbcCollection/All.h trunk/lib/darwin-9.x.universal/alembic/include/Alembic/AbcCollection/ICollections.h trunk/lib/darwin-9.x.universal/alembic/include/Alembic/AbcCollection/OCollections.h trunk/lib/darwin-9.x.universal/alembic/include/Alembic/AbcCollection/SchemaInfoDeclarations.h trunk/lib/darwin-9.x.universal/alembic/include/Alembic/AbcCoreAbstract/ trunk/lib/darwin-9.x.universal/alembic/include/Alembic/AbcCoreAbstract/All.h trunk/lib/darwin-9.x.universal/alembic/include/Alembic/AbcCoreAbstract/ArchiveReader.h trunk/lib/darwin-9.x.universal/alembic/include/Alembic/AbcCoreAbstract/ArchiveWriter.h trunk/lib/darwin-9.x.universal/alembic/include/Alembic/AbcCoreAbstract/ArrayPropertyReader.h trunk/lib/darwin-9.x.universal/alembic/include/Alembic/AbcCoreAbstract/ArrayPropertyWriter.h trunk/lib/darwin-9.x.universal/alembic/include/Alembic/AbcCoreAbstract/ArraySample.h trunk/lib/darwin-9.x.universal/alembic/include/Alembic/AbcCoreAbstract/ArraySampleKey.h trunk/lib/darwin-9.x.universal/alembic/include/Alembic/AbcCoreAbstract/BasePropertyReader.h trunk/lib/darwin-9.x.universal/alembic/include/Alembic/AbcCoreAbstract/BasePropertyWriter.h trunk/lib/darwin-9.x.universal/alembic/include/Alembic/AbcCoreAbstract/CompoundPropertyReader.h trunk/lib/darwin-9.x.universal/alembic/include/Alembic/AbcCoreAbstract/CompoundPropertyWriter.h trunk/lib/darwin-9.x.universal/alembic/include/Alembic/AbcCoreAbstract/DataType.h trunk/lib/darwin-9.x.universal/alembic/include/Alembic/AbcCoreAbstract/ForwardDeclarations.h trunk/lib/darwin-9.x.universal/alembic/include/Alembic/AbcCoreAbstract/Foundation.h trunk/lib/darwin-9.x.universal/alembic/include/Alembic/AbcCoreAbstract/MetaData.h trunk/lib/darwin-9.x.universal/alembic/include/Alembic/AbcCoreAbstract/ObjectHeader.h trunk/lib/darwin-9.x.universal/alembic/include/Alembic/AbcCoreAbstract/ObjectReader.h
[Bf-blender-cvs] [e95732b] master: Fix broken force setting multisamples only once, introduced in b5b359b48f7f
Commit: e95732bced280562be92aeb4d82d0eefb58cb06c Author: Jens Verwiebe Date: Fri Mar 6 13:07:02 2015 +0100 Branches: master https://developer.blender.org/rBe95732bced280562be92aeb4d82d0eefb58cb06c Fix broken force setting multisamples only once, introduced in b5b359b48f7f === M source/blender/windowmanager/intern/wm_window.c === diff --git a/source/blender/windowmanager/intern/wm_window.c b/source/blender/windowmanager/intern/wm_window.c index cb2f728..e341e49 100644 --- a/source/blender/windowmanager/intern/wm_window.c +++ b/source/blender/windowmanager/intern/wm_window.c @@ -363,7 +363,8 @@ static void wm_window_add_ghostwindow(wmWindowManager *wm, const char *title, wm /* force setting multisamples only once, it requires restart - and you cannot * mix it, either all windows have it, or none (tested in OSX opengl) */ if (multisamples == -1) - glSettings.numOfAASamples = U.ogl_multisamples; + multisamples = U.ogl_multisamples; + glSettings.numOfAASamples = multisamples; if (!(U.uiflag2 USER_OPENGL_NO_WARN_SUPPORT)) glSettings.flags |= GHOST_glWarnSupport; ___ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org http://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] SVN commit: /data/svn/repos/bf-blender [61498] trunk/lib/ darwin-9.x.universal/python/bin: OSX/Python: add a python binary for use in subprocesses in the future
Revision: 61498 https://developer.blender.org/rBL61498 Author: jensverwiebe Date: 2015-02-11 07:29:33 + (Wed, 11 Feb 2015) Log Message: --- OSX/Python: add a python binary for use in subprocesses in the future Added Paths: --- trunk/lib/darwin-9.x.universal/python/bin/ trunk/lib/darwin-9.x.universal/python/bin/python3.4m Added: trunk/lib/darwin-9.x.universal/python/bin/python3.4m === (Binary files differ) Index: trunk/lib/darwin-9.x.universal/python/bin/python3.4m === --- trunk/lib/darwin-9.x.universal/python/bin/python3.4m2015-02-08 18:09:40 UTC (rev 61497) +++ trunk/lib/darwin-9.x.universal/python/bin/python3.4m2015-02-11 07:29:33 UTC (rev 61498) Property changes on: trunk/lib/darwin-9.x.universal/python/bin/python3.4m ___ Added: svn:executable ## -0,0 +1 ## +* \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property ___ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org http://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] SVN commit: /data/svn/repos/bf-blender [61495] trunk/lib/ darwin-9.x.universal/osl: OSX/OSL: update along with new exr 2.2.0
Revision: 61495
https://developer.blender.org/rBL61495
Author: jensverwiebe
Date: 2015-02-08 17:54:59 + (Sun, 08 Feb 2015)
Log Message:
---
OSX/OSL: update along with new exr 2.2.0
Modified Paths:
--
trunk/lib/darwin-9.x.universal/osl/bin/oslc
trunk/lib/darwin-9.x.universal/osl/bin/oslinfo
trunk/lib/darwin-9.x.universal/osl/lib/liboslcomp.a
trunk/lib/darwin-9.x.universal/osl/lib/liboslexec.a
trunk/lib/darwin-9.x.universal/osl/lib/liboslquery.a
trunk/lib/darwin-9.x.universal/osl/shaders/emitter.oso
trunk/lib/darwin-9.x.universal/osl/shaders/glass.oso
trunk/lib/darwin-9.x.universal/osl/shaders/image.oso
trunk/lib/darwin-9.x.universal/osl/shaders/matte.oso
trunk/lib/darwin-9.x.universal/osl/shaders/metal.oso
trunk/lib/darwin-9.x.universal/osl/shaders/ubersurface.oso
trunk/lib/darwin-9.x.universal/osl/threaded_osl_osx_fix.patch
Modified: trunk/lib/darwin-9.x.universal/osl/bin/oslc
===
(Binary files differ)
Modified: trunk/lib/darwin-9.x.universal/osl/bin/oslinfo
===
(Binary files differ)
Modified: trunk/lib/darwin-9.x.universal/osl/lib/liboslcomp.a
===
(Binary files differ)
Modified: trunk/lib/darwin-9.x.universal/osl/lib/liboslexec.a
===
(Binary files differ)
Modified: trunk/lib/darwin-9.x.universal/osl/lib/liboslquery.a
===
(Binary files differ)
Modified: trunk/lib/darwin-9.x.universal/osl/shaders/emitter.oso
===
--- trunk/lib/darwin-9.x.universal/osl/shaders/emitter.oso 2015-02-04
08:23:57 UTC (rev 61494)
+++ trunk/lib/darwin-9.x.universal/osl/shaders/emitter.oso 2015-02-08
17:54:59 UTC (rev 61495)
@@ -10,9 +10,9 @@
temp float $tmp3%read{3,3} %write{2,2}
temp color $tmp4%read{4,4} %write{3,3}
code ___main___
-#
/Users/blenderfoundation/blender-build/lib/darwin-9.x.universal/OpenShadingLanguage/src/shaders/emitter.osl:48
+#
/Volumes/Workdata/Blender/Development/lib/darwin-9.x.universal/OpenShadingLanguage/src/shaders/emitter.osl:48
# Ci = (power / surfacearea()) * Cs * emission();
- closure $tmp1 $const1
%filename{/Users/blenderfoundation/blender-build/lib/darwin-9.x.universal/OpenShadingLanguage/src/shaders/emitter.osl}
%line{48} %argrw{wr}
+ closure $tmp1 $const1
%filename{/Volumes/Workdata/Blender/Development/lib/darwin-9.x.universal/OpenShadingLanguage/src/shaders/emitter.osl}
%line{48} %argrw{wr}
surfacearea $tmp2 %argrw{w}
div $tmp3 power $tmp2 %argrw{wrr}
mul $tmp4 $tmp3 Cs %argrw{wrr}
Modified: trunk/lib/darwin-9.x.universal/osl/shaders/glass.oso
===
--- trunk/lib/darwin-9.x.universal/osl/shaders/glass.oso2015-02-04
08:23:57 UTC (rev 61494)
+++ trunk/lib/darwin-9.x.universal/osl/shaders/glass.oso2015-02-08
17:54:59 UTC (rev 61495)
@@ -33,9 +33,9 @@
temp closure color $tmp17 %read{26,26} %write{25,25}
temp closure color $tmp18 %read{27,27} %write{26,26}
code ___main___
-#
/Users/blenderfoundation/blender-build/lib/darwin-9.x.universal/OpenShadingLanguage/src/shaders/glass.osl:56
+#
/Volumes/Workdata/Blender/Development/lib/darwin-9.x.universal/OpenShadingLanguage/src/shaders/glass.osl:56
# if (caustics || (!raytype(glossy) !raytype(diffuse))) {
- neq $tmp1 caustics $const1
%filename{/Users/blenderfoundation/blender-build/lib/darwin-9.x.universal/OpenShadingLanguage/src/shaders/glass.osl}
%line{56} %argrw{wrr}
+ neq $tmp1 caustics $const1
%filename{/Volumes/Workdata/Blender/Development/lib/darwin-9.x.universal/OpenShadingLanguage/src/shaders/glass.osl}
%line{56} %argrw{wrr}
if $tmp1 2 12 %argrw{r}
raytype $tmp2 $const2 %argrw{wr}
eq $tmp3 $tmp2 $const1 %argrw{wrr}
@@ -48,25 +48,25 @@
neq $tmp8 $tmp4 $const1 %argrw{wrr}
assign $tmp1 $tmp8 %argrw{wr}
if $tmp1 28 28 %argrw{r}
-#
/Users/blenderfoundation/blender-build/lib/darwin-9.x.universal/OpenShadingLanguage/src/shaders/glass.osl:58
+#
/Volumes/Workdata/Blender/Development/lib/darwin-9.x.universal/OpenShadingLanguage/src/shaders/glass.osl:58
# if (backfacing()) {
backfacing $tmp9 %line{58} %argrw{w}
if $tmp9 23 28 %argrw{r}
-#
/Users/blenderfoundation/blender-build/lib/darwin-9.x.universal/OpenShadingLanguage/src/shaders/glass.osl:59
+#
[Bf-blender-cvs] SVN commit: /data/svn/repos/bf-blender [61496] trunk/lib/ darwin-9.x.universal/openimageio/lib/libOpenImageIO.a: OSX/OIIO: update along with new exr 2.2.0
Revision: 61496 https://developer.blender.org/rBL61496 Author: jensverwiebe Date: 2015-02-08 18:02:41 + (Sun, 08 Feb 2015) Log Message: --- OSX/OIIO: update along with new exr 2.2.0 Modified Paths: -- trunk/lib/darwin-9.x.universal/openimageio/lib/libOpenImageIO.a Modified: trunk/lib/darwin-9.x.universal/openimageio/lib/libOpenImageIO.a === (Binary files differ) ___ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org http://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] SVN commit: /data/svn/repos/bf-blender [61497] trunk/lib/ darwin-9.x.universal/openexr: OSX/EXR: update to ilm/exr 2.2.0
Revision: 61497 https://developer.blender.org/rBL61497 Author: jensverwiebe Date: 2015-02-08 18:09:40 + (Sun, 08 Feb 2015) Log Message: --- OSX/EXR: update to ilm/exr 2.2.0 Modified Paths: -- trunk/lib/darwin-9.x.universal/openexr/include/OpenEXR/IexExport.h trunk/lib/darwin-9.x.universal/openexr/include/OpenEXR/IexMathFloatExc.h trunk/lib/darwin-9.x.universal/openexr/include/OpenEXR/IlmBaseConfig.h trunk/lib/darwin-9.x.universal/openexr/include/OpenEXR/ImathFrustum.h trunk/lib/darwin-9.x.universal/openexr/include/OpenEXR/ImfArray.h trunk/lib/darwin-9.x.universal/openexr/include/OpenEXR/ImfAttribute.h trunk/lib/darwin-9.x.universal/openexr/include/OpenEXR/ImfCompression.h trunk/lib/darwin-9.x.universal/openexr/include/OpenEXR/ImfConvert.h trunk/lib/darwin-9.x.universal/openexr/include/OpenEXR/ImfDeepFrameBuffer.h trunk/lib/darwin-9.x.universal/openexr/include/OpenEXR/ImfMultiView.h trunk/lib/darwin-9.x.universal/openexr/include/OpenEXR/ImfNamespace.h trunk/lib/darwin-9.x.universal/openexr/include/OpenEXR/ImfPartType.h trunk/lib/darwin-9.x.universal/openexr/include/OpenEXR/ImfRgbaFile.h trunk/lib/darwin-9.x.universal/openexr/include/OpenEXR/ImfStandardAttributes.h trunk/lib/darwin-9.x.universal/openexr/include/OpenEXR/ImfTestFile.h trunk/lib/darwin-9.x.universal/openexr/include/OpenEXR/OpenEXRConfig.h trunk/lib/darwin-9.x.universal/openexr/include/OpenEXR/halfExport.h trunk/lib/darwin-9.x.universal/openexr/lib/libHalf.a trunk/lib/darwin-9.x.universal/openexr/lib/libIex.a trunk/lib/darwin-9.x.universal/openexr/lib/libIlmImf.a trunk/lib/darwin-9.x.universal/openexr/lib/libIlmThread.a trunk/lib/darwin-9.x.universal/openexr/lib/libImath.a Added Paths: --- trunk/lib/darwin-9.x.universal/openexr/include/OpenEXR/ImathFrustumTest.h trunk/lib/darwin-9.x.universal/openexr/include/OpenEXR/ImfDeepImageState.h trunk/lib/darwin-9.x.universal/openexr/include/OpenEXR/ImfDeepImageStateAttribute.h trunk/lib/darwin-9.x.universal/openexr/lib/libIexMath.a trunk/lib/darwin-9.x.universal/openexr/lib/libIlmImfUtil.a Modified: trunk/lib/darwin-9.x.universal/openexr/include/OpenEXR/IexExport.h === --- trunk/lib/darwin-9.x.universal/openexr/include/OpenEXR/IexExport.h 2015-02-08 18:02:41 UTC (rev 61496) +++ trunk/lib/darwin-9.x.universal/openexr/include/OpenEXR/IexExport.h 2015-02-08 18:09:40 UTC (rev 61497) @@ -35,30 +35,17 @@ // /// - -#if defined(PLATFORM_WINDOWS) -# if defined(PLATFORM_BUILD_STATIC) -#define IEX_EXPORT_DEFINITION -#define IEX_IMPORT_DEFINITION -# else -#define IEX_EXPORT_DEFINITION __declspec(dllexport) -#define IEX_IMPORT_DEFINITION __declspec(dllimport) -# endif -#else // linux/macos -# if defined(PLATFORM_VISIBILITY_AVAILABLE) -#define IEX_EXPORT_DEFINITION __attribute__((visibility(default))) -#define IEX_IMPORT_DEFINITION -# else -#define IEX_EXPORT_DEFINITION -#define IEX_IMPORT_DEFINITION -# endif +#if defined(OPENEXR_DLL) +#if defined(IEX_EXPORTS) +#define IEX_EXPORT __declspec(dllexport) +#else +#define IEX_EXPORT __declspec(dllimport) +#endif +#define IEX_EXPORT_CONST +#else +#define IEX_EXPORT +#define IEX_EXPORT_CONST const #endif -#if defined(IEX_EXPORTS) // create library -# define IEX_EXPORT IEX_EXPORT_DEFINITION -#else // use library -# define IEX_EXPORT IEX_IMPORT_DEFINITION -#endif - #endif // #ifndef IEXEXPORT_H Modified: trunk/lib/darwin-9.x.universal/openexr/include/OpenEXR/IexMathFloatExc.h === --- trunk/lib/darwin-9.x.universal/openexr/include/OpenEXR/IexMathFloatExc.h 2015-02-08 18:02:41 UTC (rev 61496) +++ trunk/lib/darwin-9.x.universal/openexr/include/OpenEXR/IexMathFloatExc.h 2015-02-08 18:09:40 UTC (rev 61497) @@ -39,18 +39,21 @@ #ifndef IEXMATH_EXPORT_H #define IEXMATH_EXPORT_H -#if defined(PLATFORM_WINDOWS) !defined(ZENO_STATIC) -# ifdef IEXMATH_EXPORTS -# define IEXMATH_EXPORT __declspec(dllexport) -# else -# define IEXMATH_EXPORT __declspec(dllimport) -# endif + +#if defined(OPENEXR_DLL) +#if defined(IEX_EXPORTS) +#define IEXMATH_EXPORT __declspec(dllexport) +#else +#define IEXMATH_EXPORT __declspec(dllimport) +#endif +#define IEXMATH_EXPORT_CONST #else -# define IEXMATH_EXPORT +#define IEXMATH_EXPORT +#define IEXMATH_EXPORT_CONST const #endif + #endif - #include IexNamespace.h #include IexMathExc.h //#include IexBaseExc.h Modified: trunk/lib/darwin-9.x.universal/openexr/include/OpenEXR/IlmBaseConfig.h === ---
[Bf-blender-cvs] [ae1d416] blender-v2.73-release: OSX: revive GHOST_HACK_getFirstFile cause it breaks things on older OSX versions. Dunno exactly why this was done earlier, but propose not to remove c
Commit: ae1d416aecbc916259265f70a246af0d59538fb6
Author: Jens Verwiebe
Date: Thu Dec 25 15:12:56 2014 +0100
Branches: blender-v2.73-release
https://developer.blender.org/rBae1d416aecbc916259265f70a246af0d59538fb6
OSX: revive GHOST_HACK_getFirstFile cause it breaks things on older OSX
versions.
Dunno exactly why this was done earlier, but propose not to remove code not
understood.
===
M intern/ghost/intern/GHOST_SystemCocoa.mm
M source/creator/creator.c
M source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
===
diff --git a/intern/ghost/intern/GHOST_SystemCocoa.mm
b/intern/ghost/intern/GHOST_SystemCocoa.mm
index cfa1e8b..61caf3f 100644
--- a/intern/ghost/intern/GHOST_SystemCocoa.mm
+++ b/intern/ghost/intern/GHOST_SystemCocoa.mm
@@ -255,6 +255,24 @@ static GHOST_TKey convertKey(int rawCode, unichar
recvChar, UInt16 keyAction)
return GHOST_kKeyUnknown;
}
+#pragma mark Utility functions
+
+#define FIRSTFILEBUFLG 512
+static bool g_hasFirstFile = false;
+static char g_firstFileBuf[512];
+
+//TODO:Need to investigate this. Function called too early in creator.c to
have g_hasFirstFile == true
+extern C int GHOST_HACK_getFirstFile(char buf[FIRSTFILEBUFLG])
+{
+ if (g_hasFirstFile) {
+ strncpy(buf, g_firstFileBuf, FIRSTFILEBUFLG - 1);
+ buf[FIRSTFILEBUFLG - 1] = '\0';
+ return 1;
+ }
+ else {
+ return 0;
+ }
+}
#pragma mark Cocoa objects
diff --git a/source/creator/creator.c b/source/creator/creator.c
index efef309..cc80494 100644
--- a/source/creator/creator.c
+++ b/source/creator/creator.c
@@ -1001,7 +1001,7 @@ static int render_animation(int UNUSED(argc), const char
**UNUSED(argv), void *d
BLI_end_threaded_malloc();
}
else {
- printf(\nError: no blend loaded. cannot use '-a'.\n);
+ printf(\nError: no blend loaded. GPG_ghost.cpp use '-a'.\n);
}
return 0;
}
@@ -1551,7 +1551,22 @@ int main(
#endif
setCallbacks();
+
+#if defined(__APPLE__) !defined(WITH_PYTHON_MODULE)
+/* patch to ignore argument finder gives us (pid?) */
+ if (argc == 2 strncmp(argv[1], -psn_, 5) == 0) {
+ extern int GHOST_HACK_getFirstFile(char buf[]);
+ static char firstfilebuf[512];
+
+ argc = 1;
+ if (GHOST_HACK_getFirstFile(firstfilebuf)) {
+ argc = 2;
+ argv[1] = firstfilebuf;
+ }
+ }
+#endif
+
#ifdef __FreeBSD__
fpsetmask(0);
#endif
diff --git a/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
b/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
index 3e87b4a..915fe61 100644
--- a/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
+++ b/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
@@ -80,6 +80,10 @@ extern C
#include IMB_imbuf.h
#include IMB_moviecache.h
+#ifdef __APPLE__
+ int GHOST_HACK_getFirstFile(char buf[]);
+#endif
+
// For BLF
#include BLF_api.h
#include BLF_translation.h
@@ -297,6 +301,12 @@ static void get_filename(int argc, char **argv, char
*filename)
if (BLI_exists(argv[argc-1])) {
BLI_strncpy(filename, argv[argc-1], FILE_MAX);
}
+ if (::strncmp(argv[argc-1], -psn_, 5)==0) {
+ static char firstfilebuf[512];
+ if (GHOST_HACK_getFirstFile(firstfilebuf)) {
+ BLI_strncpy(filename, firstfilebuf, FILE_MAX);
+ }
+ }
}
srclen -= ::strlen(MacOS/blenderplayer);
___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] [e5063b0] master: Cleanup: OSX: remove obsolete ppc/ppc64 sw-renderer kCGL attributes
Commit: e5063b0bd3e499698a4016a7ff063bea4b667c34
Author: Jens Verwiebe
Date: Sun Jan 4 20:42:16 2015 +0100
Branches: master
https://developer.blender.org/rBe5063b0bd3e499698a4016a7ff063bea4b667c34
Cleanup: OSX: remove obsolete ppc/ppc64 sw-renderer kCGL attributes
===
M intern/ghost/intern/GHOST_ContextCGL.mm
===
diff --git a/intern/ghost/intern/GHOST_ContextCGL.mm
b/intern/ghost/intern/GHOST_ContextCGL.mm
index b96a1dc..37fd4a3 100644
--- a/intern/ghost/intern/GHOST_ContextCGL.mm
+++ b/intern/ghost/intern/GHOST_ContextCGL.mm
@@ -192,11 +192,7 @@ static void makeAttribList(
* Maybe a command line flag is better... */
if (getenv(BLENDER_SOFTWAREGL)) {
attribs.push_back(NSOpenGLPFARendererID);
-#if defined(__ppc__) || defined(__ppc64__)
- attribs.push_back(kCGLRendererAppleSWID);
-#else
attribs.push_back(kCGLRendererGenericFloatID);
-#endif
}
else {
attribs.push_back(NSOpenGLPFAAccelerated);
___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] [70b6c82] master: Fix an odd line that slipped in my ghost_hack_first_file commit
Commit: 70b6c82fd37150bcd7424183d5397edcb4bfbd20
Author: Jens Verwiebe
Date: Tue Dec 30 18:31:25 2014 +0100
Branches: master
https://developer.blender.org/rB70b6c82fd37150bcd7424183d5397edcb4bfbd20
Fix an odd line that slipped in my ghost_hack_first_file commit
===
M source/creator/creator.c
===
diff --git a/source/creator/creator.c b/source/creator/creator.c
index cc80494..83741a6 100644
--- a/source/creator/creator.c
+++ b/source/creator/creator.c
@@ -1001,7 +1001,7 @@ static int render_animation(int UNUSED(argc), const char
**UNUSED(argv), void *d
BLI_end_threaded_malloc();
}
else {
- printf(\nError: no blend loaded. GPG_ghost.cpp use '-a'.\n);
+ printf(\nError: no blend loaded. cannot use '-a'.\n);
}
return 0;
}
___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] [c1f54bc] master: OSX: revive GHOST_HACK_getFirstFile cause it breaks things on older OSX versions. Dunno exactly why this was done earlier, but propose not to remove code not underst
Commit: c1f54bcdcca40ef74fac2fa269824f612b4ed8d8
Author: Jens Verwiebe
Date: Thu Dec 25 15:12:56 2014 +0100
Branches: master
https://developer.blender.org/rBc1f54bcdcca40ef74fac2fa269824f612b4ed8d8
OSX: revive GHOST_HACK_getFirstFile cause it breaks things on older OSX
versions.
Dunno exactly why this was done earlier, but propose not to remove code not
understood.
===
M intern/ghost/intern/GHOST_SystemCocoa.mm
M source/creator/creator.c
M source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
===
diff --git a/intern/ghost/intern/GHOST_SystemCocoa.mm
b/intern/ghost/intern/GHOST_SystemCocoa.mm
index cfa1e8b..61caf3f 100644
--- a/intern/ghost/intern/GHOST_SystemCocoa.mm
+++ b/intern/ghost/intern/GHOST_SystemCocoa.mm
@@ -255,6 +255,24 @@ static GHOST_TKey convertKey(int rawCode, unichar
recvChar, UInt16 keyAction)
return GHOST_kKeyUnknown;
}
+#pragma mark Utility functions
+
+#define FIRSTFILEBUFLG 512
+static bool g_hasFirstFile = false;
+static char g_firstFileBuf[512];
+
+//TODO:Need to investigate this. Function called too early in creator.c to
have g_hasFirstFile == true
+extern C int GHOST_HACK_getFirstFile(char buf[FIRSTFILEBUFLG])
+{
+ if (g_hasFirstFile) {
+ strncpy(buf, g_firstFileBuf, FIRSTFILEBUFLG - 1);
+ buf[FIRSTFILEBUFLG - 1] = '\0';
+ return 1;
+ }
+ else {
+ return 0;
+ }
+}
#pragma mark Cocoa objects
diff --git a/source/creator/creator.c b/source/creator/creator.c
index efef309..cc80494 100644
--- a/source/creator/creator.c
+++ b/source/creator/creator.c
@@ -1001,7 +1001,7 @@ static int render_animation(int UNUSED(argc), const char
**UNUSED(argv), void *d
BLI_end_threaded_malloc();
}
else {
- printf(\nError: no blend loaded. cannot use '-a'.\n);
+ printf(\nError: no blend loaded. GPG_ghost.cpp use '-a'.\n);
}
return 0;
}
@@ -1551,7 +1551,22 @@ int main(
#endif
setCallbacks();
+
+#if defined(__APPLE__) !defined(WITH_PYTHON_MODULE)
+/* patch to ignore argument finder gives us (pid?) */
+ if (argc == 2 strncmp(argv[1], -psn_, 5) == 0) {
+ extern int GHOST_HACK_getFirstFile(char buf[]);
+ static char firstfilebuf[512];
+
+ argc = 1;
+ if (GHOST_HACK_getFirstFile(firstfilebuf)) {
+ argc = 2;
+ argv[1] = firstfilebuf;
+ }
+ }
+#endif
+
#ifdef __FreeBSD__
fpsetmask(0);
#endif
diff --git a/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
b/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
index 3e87b4a..915fe61 100644
--- a/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
+++ b/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
@@ -80,6 +80,10 @@ extern C
#include IMB_imbuf.h
#include IMB_moviecache.h
+#ifdef __APPLE__
+ int GHOST_HACK_getFirstFile(char buf[]);
+#endif
+
// For BLF
#include BLF_api.h
#include BLF_translation.h
@@ -297,6 +301,12 @@ static void get_filename(int argc, char **argv, char
*filename)
if (BLI_exists(argv[argc-1])) {
BLI_strncpy(filename, argv[argc-1], FILE_MAX);
}
+ if (::strncmp(argv[argc-1], -psn_, 5)==0) {
+ static char firstfilebuf[512];
+ if (GHOST_HACK_getFirstFile(firstfilebuf)) {
+ BLI_strncpy(filename, firstfilebuf, FILE_MAX);
+ }
+ }
}
srclen -= ::strlen(MacOS/blenderplayer);
___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] [6e8a8a7] master: OSX: change previous commit to not only make animation-player window frontmost but whole process
Commit: 6e8a8a72a3ce00b3d16c0301fac0c2e24cf027a4 Author: Jens Verwiebe Date: Sat Dec 6 12:13:28 2014 +0100 Branches: master https://developer.blender.org/rB6e8a8a72a3ce00b3d16c0301fac0c2e24cf027a4 OSX: change previous commit to not only make animation-player window frontmost but whole process === M intern/ghost/intern/GHOST_WindowCocoa.mm === diff --git a/intern/ghost/intern/GHOST_WindowCocoa.mm b/intern/ghost/intern/GHOST_WindowCocoa.mm index fed44ea..65d371c 100644 --- a/intern/ghost/intern/GHOST_WindowCocoa.mm +++ b/intern/ghost/intern/GHOST_WindowCocoa.mm @@ -645,7 +645,7 @@ GHOST_WindowCocoa::GHOST_WindowCocoa( m_lionStyleFullScreen = true; } - [m_window orderFrontRegardless]; // to rise window for new blender instance animation play case + [NSApp activateIgnoringOtherApps:YES]; // raise application to front, important for new blender instance animation play case [pool drain]; } ___ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org http://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] [81ae71f] master: Fix crash in RE_AcquiredResultGet32 on debug builds introduced yesterday
Commit: 81ae71fcd3ea1406f0bca05471c17d984738ff4c Author: Jens Verwiebe Date: Sat Dec 6 12:30:59 2014 +0100 Branches: master https://developer.blender.org/rB81ae71fcd3ea1406f0bca05471c17d984738ff4c Fix crash in RE_AcquiredResultGet32 on debug builds introduced yesterday === M source/blender/editors/render/render_preview.c === diff --git a/source/blender/editors/render/render_preview.c b/source/blender/editors/render/render_preview.c index 42602f3..b36e4e2 100644 --- a/source/blender/editors/render/render_preview.c +++ b/source/blender/editors/render/render_preview.c @@ -561,8 +561,9 @@ static bool ed_preview_draw_rect(ScrArea *sa, int split, int first, rcti *rect, unsigned char *rect_byte = MEM_mallocN(rres.rectx * rres.recty * sizeof(int), ed_preview_draw_rect); float fx = rect-xmin + offx; float fy = rect-ymin; + if (re) + RE_AcquiredResultGet32(re, rres, (unsigned int *)rect_byte); - RE_AcquiredResultGet32(re, rres, (unsigned int *)rect_byte); glaDrawPixelsSafe(fx, fy, rres.rectx, rres.recty, rres.rectx, GL_RGBA, GL_UNSIGNED_BYTE, rect_byte); MEM_freeN(rect_byte); ___ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org http://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] [825d6ad] master: OSX: make sure window of new blender instance is front when playing animation
Commit: 825d6adef5c47b172475c0359769b394f2adaf7a Author: Jens Verwiebe Date: Fri Dec 5 18:41:59 2014 +0100 Branches: master https://developer.blender.org/rB825d6adef5c47b172475c0359769b394f2adaf7a OSX: make sure window of new blender instance is front when playing animation === M intern/ghost/intern/GHOST_WindowCocoa.mm === diff --git a/intern/ghost/intern/GHOST_WindowCocoa.mm b/intern/ghost/intern/GHOST_WindowCocoa.mm index ab313b0..fed44ea 100644 --- a/intern/ghost/intern/GHOST_WindowCocoa.mm +++ b/intern/ghost/intern/GHOST_WindowCocoa.mm @@ -645,6 +645,8 @@ GHOST_WindowCocoa::GHOST_WindowCocoa( m_lionStyleFullScreen = true; } + [m_window orderFrontRegardless]; // to rise window for new blender instance animation play case + [pool drain]; } ___ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org http://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] [871cf70] master: Fix playercompile after ecc03c8ed
Commit: 871cf701445a6a9c8aa39f1ac6809aebe7d49e56 Author: Jens Verwiebe Date: Fri Dec 5 18:51:19 2014 +0100 Branches: master https://developer.blender.org/rB871cf701445a6a9c8aa39f1ac6809aebe7d49e56 Fix playercompile after ecc03c8ed === M source/blenderplayer/bad_level_call_stubs/stubs.c === diff --git a/source/blenderplayer/bad_level_call_stubs/stubs.c b/source/blenderplayer/bad_level_call_stubs/stubs.c index ccdf082..6ba2b6c 100644 --- a/source/blenderplayer/bad_level_call_stubs/stubs.c +++ b/source/blenderplayer/bad_level_call_stubs/stubs.c @@ -574,6 +574,7 @@ struct RenderStats *RE_GetStats(struct Render *re) RET_NULL struct RenderData *RE_engine_get_render_data(struct Render *re) RET_NULL void RE_engine_update_result(struct RenderEngine *engine, struct RenderResult *result) RET_NONE void RE_engine_update_progress(struct RenderEngine *engine, float progress) RET_NONE +void RE_engine_set_error_message(RenderEngine *engine, const char *msg) RET_NONE void RE_engine_end_result(RenderEngine *engine, struct RenderResult *result, int cancel, int merge_results) RET_NONE void RE_engine_update_stats(RenderEngine *engine, const char *stats, const char *info) RET_NONE void RE_layer_load_from_file(struct RenderLayer *layer, struct ReportList *reports, const char *filename, int x, int y) RET_NONE ___ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org http://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] SVN commit: /data/svn/repos/bf-blender [61456] trunk/lib/ darwin-9.x.universal: OSX/Python: fix unavailable new posix functions used when compiled against 10.10.sdk
Revision: 61456 https://developer.blender.org/rBL61456 Author: jensverwiebe Date: 2014-11-25 11:16:01 + (Tue, 25 Nov 2014) Log Message: --- OSX/Python: fix unavailable new posix functions used when compiled against 10.10.sdk Modified Paths: -- trunk/lib/darwin-9.x.universal/python/lib/python3.4/libpython3.4m.a trunk/lib/darwin-9.x.universal/release/python_i386.zip trunk/lib/darwin-9.x.universal/release/python_x86_64.zip Modified: trunk/lib/darwin-9.x.universal/python/lib/python3.4/libpython3.4m.a === (Binary files differ) Modified: trunk/lib/darwin-9.x.universal/release/python_i386.zip === (Binary files differ) Modified: trunk/lib/darwin-9.x.universal/release/python_x86_64.zip === (Binary files differ) ___ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org http://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] SVN commit: /data/svn/repos/bf-blender [61457] trunk/lib/ darwin-9.x.universal/python/include/python3.4m/pyconfig.h: OSX/Python: just to be sure undefine some posix functions too new,
Revision: 61457 https://developer.blender.org/rBL61457 Author: jensverwiebe Date: 2014-11-25 11:40:01 + (Tue, 25 Nov 2014) Log Message: --- OSX/Python: just to be sure undefine some posix functions too new, no functional change in Blender unless pyconfig.h is included somewhere Modified Paths: -- trunk/lib/darwin-9.x.universal/python/include/python3.4m/pyconfig.h Modified: trunk/lib/darwin-9.x.universal/python/include/python3.4m/pyconfig.h === --- trunk/lib/darwin-9.x.universal/python/include/python3.4m/pyconfig.h 2014-11-25 11:16:01 UTC (rev 61456) +++ trunk/lib/darwin-9.x.universal/python/include/python3.4m/pyconfig.h 2014-11-25 11:40:01 UTC (rev 61457) @@ -228,7 +228,7 @@ #define HAVE_EXPM1 1 /* Define to 1 if you have the `faccessat' function. */ -#define HAVE_FACCESSAT 1 +/* #undef HAVE_FACCESSAT */ /* Define if you have the 'fchdir' function. */ #define HAVE_FCHDIR 1 @@ -237,13 +237,13 @@ #define HAVE_FCHMOD 1 /* Define to 1 if you have the `fchmodat' function. */ -#define HAVE_FCHMODAT 1 +/* #undef HAVE_FCHMODAT */ /* Define to 1 if you have the `fchown' function. */ #define HAVE_FCHOWN 1 /* Define to 1 if you have the `fchownat' function. */ -#define HAVE_FCHOWNAT 1 +/* #undef HAVE_FCHOWNAT */ /* Define to 1 if you have the fcntl.h header file. */ #define HAVE_FCNTL_H 1 @@ -252,7 +252,7 @@ /* #undef HAVE_FDATASYNC */ /* Define to 1 if you have the `fdopendir' function. */ -#define HAVE_FDOPENDIR 1 +/* #undef HAVE_FDOPENDIR */ /* Define to 1 if you have the `fexecve' function. */ /* #undef HAVE_FEXECVE */ @@ -279,7 +279,7 @@ #define HAVE_FSEEKO 1 /* Define to 1 if you have the `fstatat' function. */ -#define HAVE_FSTATAT 1 +/* #undef HAVE_FSTATAT */ /* Define to 1 if you have the `fstatvfs' function. */ #define HAVE_FSTATVFS 1 @@ -509,7 +509,7 @@ #define HAVE_LINK 1 /* Define to 1 if you have the `linkat' function. */ -#define HAVE_LINKAT 1 +/* #undef HAVE_LINKAT */ /* Define to 1 if you have the linux/can/bcm.h header file. */ /* #undef HAVE_LINUX_CAN_BCM_H */ @@ -563,7 +563,7 @@ /* #undef HAVE_MEMRCHR */ /* Define to 1 if you have the `mkdirat' function. */ -#define HAVE_MKDIRAT 1 +/* #undef HAVE_MKDIRAT */ /* Define to 1 if you have the `mkfifo' function. */ #define HAVE_MKFIFO 1 @@ -602,7 +602,7 @@ #define HAVE_NICE 1 /* Define to 1 if you have the `openat' function. */ -#define HAVE_OPENAT 1 +/* #undef HAVE_OPENAT */ /* Define to 1 if you have the `openpty' function. */ #define HAVE_OPENPTY 1 @@ -677,7 +677,7 @@ #define HAVE_READLINK 1 /* Define to 1 if you have the `readlinkat' function. */ -#define HAVE_READLINKAT 1 +/* #undef HAVE_READLINKAT */ /* Define to 1 if you have the `readv' function. */ #define HAVE_READV 1 @@ -686,7 +686,7 @@ #define HAVE_REALPATH 1 /* Define to 1 if you have the `renameat' function. */ -#define HAVE_RENAMEAT 1 +/* #undef HAVE_RENAMEAT */ /* Define if you have readline 2.1 */ #define HAVE_RL_CALLBACK 1 @@ -913,7 +913,7 @@ #define HAVE_SYMLINK 1 /* Define to 1 if you have the `symlinkat' function. */ -#define HAVE_SYMLINKAT 1 +/* #undef HAVE_SYMLINKAT */ /* Define to 1 if you have the `sync' function. */ #define HAVE_SYNC 1 @@ -1091,7 +1091,7 @@ #define HAVE_UNISTD_H 1 /* Define to 1 if you have the `unlinkat' function. */ -#define HAVE_UNLINKAT 1 +/* #undef HAVE_UNLINKAT */ /* Define to 1 if you have the `unsetenv' function. */ #define HAVE_UNSETENV 1 ___ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org http://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] SVN commit: /data/svn/repos/bf-blender [61448] trunk/lib/ darwin-9.x.universal: OSX: 64bit, update to Python 3.4.2 with numpy 1.9.1
Revision: 61448
https://developer.blender.org/rBL61448
Author: jensverwiebe
Date: 2014-11-24 17:56:55 + (Mon, 24 Nov 2014)
Log Message:
---
OSX: 64bit, update to Python 3.4.2 with numpy 1.9.1
Modified Paths:
--
trunk/lib/darwin-9.x.universal/python/include/python3.4m/abstract.h
trunk/lib/darwin-9.x.universal/python/include/python3.4m/codecs.h
trunk/lib/darwin-9.x.universal/python/include/python3.4m/listobject.h
trunk/lib/darwin-9.x.universal/python/include/python3.4m/objimpl.h
trunk/lib/darwin-9.x.universal/python/include/python3.4m/patchlevel.h
trunk/lib/darwin-9.x.universal/python/include/python3.4m/pyconfig.h
trunk/lib/darwin-9.x.universal/python/include/python3.4m/pytime.h
trunk/lib/darwin-9.x.universal/python/include/python3.4m/sysmodule.h
trunk/lib/darwin-9.x.universal/python/include/python3.4m/unicodeobject.h
trunk/lib/darwin-9.x.universal/python/lib/python3.4/libpython3.4m.a
trunk/lib/darwin-9.x.universal/release/python_x86_64.zip
Modified: trunk/lib/darwin-9.x.universal/python/include/python3.4m/abstract.h
===
--- trunk/lib/darwin-9.x.universal/python/include/python3.4m/abstract.h
2014-11-24 16:44:44 UTC (rev 61447)
+++ trunk/lib/darwin-9.x.universal/python/include/python3.4m/abstract.h
2014-11-24 17:56:55 UTC (rev 61448)
@@ -1021,7 +1021,7 @@
PyAPI_FUNC(PyObject *) PySequence_Fast(PyObject *o, const char* m);
/*
- Returns the sequence, o, as a list, unless it's already a
+ Return the sequence, o, as a list, unless it's already a
tuple or list. Use PySequence_Fast_GET_ITEM to access the
members of this list, and PySequence_Fast_GET_SIZE to get its length.
Modified: trunk/lib/darwin-9.x.universal/python/include/python3.4m/codecs.h
===
--- trunk/lib/darwin-9.x.universal/python/include/python3.4m/codecs.h
2014-11-24 16:44:44 UTC (rev 61447)
+++ trunk/lib/darwin-9.x.universal/python/include/python3.4m/codecs.h
2014-11-24 17:56:55 UTC (rev 61448)
@@ -49,6 +49,10 @@
PyAPI_FUNC(PyObject *) _PyCodec_Lookup(
const char *encoding
);
+
+PyAPI_FUNC(int) _PyCodec_Forget(
+ const char *encoding
+ );
#endif
/* Codec registry encoding check API.
Modified: trunk/lib/darwin-9.x.universal/python/include/python3.4m/listobject.h
===
--- trunk/lib/darwin-9.x.universal/python/include/python3.4m/listobject.h
2014-11-24 16:44:44 UTC (rev 61447)
+++ trunk/lib/darwin-9.x.universal/python/include/python3.4m/listobject.h
2014-11-24 17:56:55 UTC (rev 61448)
@@ -46,7 +46,7 @@
PyAPI_DATA(PyTypeObject) PySortWrapper_Type;
#define PyList_Check(op) \
- PyType_FastSubclass(Py_TYPE(op), Py_TPFLAGS_LIST_SUBCLASS)
+PyType_FastSubclass(Py_TYPE(op), Py_TPFLAGS_LIST_SUBCLASS)
#define PyList_CheckExact(op) (Py_TYPE(op) == PyList_Type)
PyAPI_FUNC(PyObject *) PyList_New(Py_ssize_t size);
Modified: trunk/lib/darwin-9.x.universal/python/include/python3.4m/objimpl.h
===
--- trunk/lib/darwin-9.x.universal/python/include/python3.4m/objimpl.h
2014-11-24 16:44:44 UTC (rev 61447)
+++ trunk/lib/darwin-9.x.universal/python/include/python3.4m/objimpl.h
2014-11-24 17:56:55 UTC (rev 61448)
@@ -265,7 +265,7 @@
#define _PyGCHead_REFS(g) ((g)-gc.gc_refs _PyGC_REFS_SHIFT)
#define _PyGCHead_SET_REFS(g, v) do { \
(g)-gc.gc_refs = ((g)-gc.gc_refs ~_PyGC_REFS_MASK) \
-| (v _PyGC_REFS_SHIFT); \
+| (((size_t)(v)) _PyGC_REFS_SHIFT); \
} while (0)
#define _PyGCHead_DECREF(g) ((g)-gc.gc_refs -= 1 _PyGC_REFS_SHIFT)
Modified: trunk/lib/darwin-9.x.universal/python/include/python3.4m/patchlevel.h
===
--- trunk/lib/darwin-9.x.universal/python/include/python3.4m/patchlevel.h
2014-11-24 16:44:44 UTC (rev 61447)
+++ trunk/lib/darwin-9.x.universal/python/include/python3.4m/patchlevel.h
2014-11-24 17:56:55 UTC (rev 61448)
@@ -18,12 +18,12 @@
/*--start constants--*/
#define PY_MAJOR_VERSION 3
#define PY_MINOR_VERSION 4
-#define PY_MICRO_VERSION 0
+#define PY_MICRO_VERSION 2
#define PY_RELEASE_LEVEL PY_RELEASE_LEVEL_FINAL
#define PY_RELEASE_SERIAL 0
/* Version as a string */
-#define PY_VERSION 3.4.0
+#define PY_VERSION 3.4.2
/*--end constants--*/
/* Version as a single 4-byte hex number, e.g. 0x010502B2 == 1.5.2b2.
Modified: trunk/lib/darwin-9.x.universal/python/include/python3.4m/pyconfig.h
===
--- trunk/lib/darwin-9.x.universal/python/include/python3.4m/pyconfig.h
2014-11-24 16:44:44 UTC (rev 61447)
+++
[Bf-blender-cvs] SVN commit: /data/svn/repos/bf-blender [61449] trunk/lib/ darwin-9.x.universal/release/python_i386.zip: OSX: 32bit, update to Python 3.4.2 with numpy 1.9.1
Revision: 61449 https://developer.blender.org/rBL61449 Author: jensverwiebe Date: 2014-11-24 18:04:03 + (Mon, 24 Nov 2014) Log Message: --- OSX: 32bit, update to Python 3.4.2 with numpy 1.9.1 Modified Paths: -- trunk/lib/darwin-9.x.universal/release/python_i386.zip Modified: trunk/lib/darwin-9.x.universal/release/python_i386.zip === (Binary files differ) ___ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org http://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] SVN commit: /data/svn/repos/bf-blender [61450] trunk/lib/ darwin-9.x.universal/release/python_i386.zip: OSX: replace numpy with correct arch in 32bit zip
Revision: 61450 https://developer.blender.org/rBL61450 Author: jensverwiebe Date: 2014-11-24 18:08:13 + (Mon, 24 Nov 2014) Log Message: --- OSX:replace numpy with correct arch in 32bit zip Modified Paths: -- trunk/lib/darwin-9.x.universal/release/python_i386.zip Modified: trunk/lib/darwin-9.x.universal/release/python_i386.zip === (Binary files differ) ___ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org http://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] SVN commit: /data/svn/repos/bf-blender [61446] trunk/lib/ darwin-9.x.universal/sdl/lib/libSDL2.a: Renew libSDL2
Revision: 61446 https://developer.blender.org/rBL61446 Author: jensverwiebe Date: 2014-11-19 19:27:14 + (Wed, 19 Nov 2014) Log Message: --- Renew libSDL2 Modified Paths: -- trunk/lib/darwin-9.x.universal/sdl/lib/libSDL2.a Modified: trunk/lib/darwin-9.x.universal/sdl/lib/libSDL2.a === (Binary files differ) ___ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org http://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] [5f7b273] master: OSX/cpack: add a dummy bg and ds_store for dmg
Commit: 5f7b273236fc09ad4752529b964e0e1d6c681979
Author: Jens Verwiebe
Date: Tue Nov 18 10:31:22 2014 +0100
Branches: master
https://developer.blender.org/rB5f7b273236fc09ad4752529b964e0e1d6c681979
OSX/cpack: add a dummy bg and ds_store for dmg
===
M build_files/cmake/packaging.cmake
A release/darwin/SET_DS_Store
A release/darwin/background.png
===
diff --git a/build_files/cmake/packaging.cmake
b/build_files/cmake/packaging.cmake
index 95bbb2b..3f442c0 100644
--- a/build_files/cmake/packaging.cmake
+++ b/build_files/cmake/packaging.cmake
@@ -59,6 +59,8 @@ if(APPLE)
# Libraries are bundled directly
set(CPACK_COMPONENT_LIBRARIES_HIDDEN TRUE)
+ set(CPACK_DMG_BACKGROUND_IMAGE
${CMAKE_SOURCE_DIR}/release/darwin/background.png)
+ set(CPACK_DMG_DS_STORE
${CMAKE_SOURCE_DIR}/release/darwin/SET_DS_Store)
endif()
if(WIN32)
diff --git a/release/darwin/SET_DS_Store b/release/darwin/SET_DS_Store
new file mode 100644
index 000..80bc4c2
Binary files /dev/null and b/release/darwin/SET_DS_Store differ
diff --git a/release/darwin/background.png b/release/darwin/background.png
new file mode 100644
index 000..ed9
Binary files /dev/null and b/release/darwin/background.png differ
___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] [ffbb950] master: Fix player compile ( take into account to textcompile with player always aka default on in cmake too)
Commit: ffbb950da9d6d64297ebb0ae56500b67dec97190 Author: Jens Verwiebe Date: Tue Nov 18 16:45:52 2014 +0100 Branches: master https://developer.blender.org/rBffbb950da9d6d64297ebb0ae56500b67dec97190 Fix player compile ( take into account to textcompile with player always aka default on in cmake too) === M source/blenderplayer/bad_level_call_stubs/stubs.c === diff --git a/source/blenderplayer/bad_level_call_stubs/stubs.c b/source/blenderplayer/bad_level_call_stubs/stubs.c index a5a8d9b..66af7fa 100644 --- a/source/blenderplayer/bad_level_call_stubs/stubs.c +++ b/source/blenderplayer/bad_level_call_stubs/stubs.c @@ -349,6 +349,7 @@ void ED_area_tag_redraw_regiontype(struct ScrArea *sa, int regiontype) RET_NONE void ED_render_engine_changed(struct Main *bmain) RET_NONE void ED_file_read_bookmarks(void) RET_NONE +void ED_preview_kill_jobs(struct wmWindowManager *wm, struct Main *bmain) RET_NONE struct PTCacheEdit *PE_get_current(struct Scene *scene, struct Object *ob) RET_NULL void PE_current_changed(struct Scene *scene, struct Object *ob) RET_NONE ___ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org http://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] SVN commit: /data/svn/repos/bf-blender [61442] trunk/lib/ darwin-9.x.universal/openmp/lib/libiomp5.dylib: OpenMP: change ID to @loader_path/../Resources/lib/libiomp5.dylib
Revision: 61442 https://developer.blender.org/rBL61442 Author: jensverwiebe Date: 2014-11-16 16:05:09 + (Sun, 16 Nov 2014) Log Message: --- OpenMP: change ID to @loader_path/../Resources/lib/libiomp5.dylib Modified Paths: -- trunk/lib/darwin-9.x.universal/openmp/lib/libiomp5.dylib Modified: trunk/lib/darwin-9.x.universal/openmp/lib/libiomp5.dylib === (Binary files differ) ___ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org http://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] [fa821a9] master: OSX/buildsystems: unify openmp handling by changing iomp5 id to @loader_path/../Resources/lib/libiomp5.dylib This makes install_name_tool usage obsolete here and als
Commit: fa821a969ea935b0251f9aa0c893ab174e03a580
Author: Jens Verwiebe
Date: Sun Nov 16 17:03:44 2014 +0100
Branches: master
https://developer.blender.org/rBfa821a969ea935b0251f9aa0c893ab174e03a580
OSX/buildsystems: unify openmp handling by changing iomp5 id to
@loader_path/../Resources/lib/libiomp5.dylib
This makes install_name_tool usage obsolete here and also assures cmake builds
can be codesigned.
IMPORTANT: update lib (darwin-9.x.universal/openmp)
===
M CMakeLists.txt
M build_files/scons/tools/Blender.py
M source/creator/CMakeLists.txt
===
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 316191a..acf1bb4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2049,7 +2049,7 @@ elseif(APPLE)
link_directories(${LIBDIR}/openmp/lib)
# This is a workaround for our helperbinaries (
datatoc, masgfmt, ... ),
# They are linked also to omp lib, so we need
it in builddir for runtime exexcution, TODO: remove all unneeded dependencies
from these
- execute_process(COMMAND ditto -arch
${CMAKE_OSX_ARCHITECTURES} ${LIBDIR}/openmp/lib/libiomp5.dylib
${CMAKE_BINARY_DIR}/bin/libiomp5.dylib) # for intermediate binaries, lib id
@loader_path
+ execute_process(COMMAND ditto -arch
${CMAKE_OSX_ARCHITECTURES} ${LIBDIR}/openmp/lib/libiomp5.dylib
${CMAKE_BINARY_DIR}/Resources/lib/libiomp5.dylib) # for intermediate binaries,
lib id @loader_path
endif()
endif()
endif()
diff --git a/build_files/scons/tools/Blender.py
b/build_files/scons/tools/Blender.py
index b5853b2..f5118da 100755
--- a/build_files/scons/tools/Blender.py
+++ b/build_files/scons/tools/Blender.py
@@ -809,10 +809,6 @@ def AppIt(target=None, source=None, env=None):
instname = env['LCGDIR'][1:] # made libiomp5 part of blender libs
cmd = 'ditto --arch %s %s/openmp/lib/libiomp5.dylib
%s/%s.app/Contents/Resources/lib/'%(osxarch, instname, installdir, binary) #
copy libiomp5
commands.getoutput(cmd)
-cmd = 'install_name_tool -id
@loader_path/../Resources/lib/libiomp5.dylib
%s/%s.app/Contents/Resources/lib/libiomp5.dylib'%(installdir, binary) # change
id of libiomp5
-commands.getoutput(cmd)
-cmd = 'install_name_tool -change @loader_path/libiomp5.dylib
@loader_path/../Resources/lib/libiomp5.dylib
%s/%s.app/Contents/MacOS/%s'%(installdir, binary, binary) # change ref to
libiomp5 ( blender )
-commands.getoutput(cmd)
# extract copy system python, be sure to update other build systems
# when making changes to the files that are copied.
diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt
index bb669b6..434f3c4 100644
--- a/source/creator/CMakeLists.txt
+++ b/source/creator/CMakeLists.txt
@@ -837,7 +837,7 @@ elseif(APPLE)
if(WITH_OPENMP AND CMAKE_C_COMPILER_ID MATCHES Clang AND NOT
${CMAKE_C_COMPILER_VERSION} VERSION_LESS '3.4')
install(
FILES ${LIBDIR}/openmp/lib/libiomp5.dylib
- DESTINATION blender.app/Contents/MacOS
+ DESTINATION blender.app/Contents/Resources/lib/
)
endif()
___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] [ed52706] master: Just 2 comments cleaned
Commit: ed52706d352334f15c1183131461a8112427ea22
Author: Jens Verwiebe
Date: Sun Nov 16 17:12:49 2014 +0100
Branches: master
https://developer.blender.org/rBed52706d352334f15c1183131461a8112427ea22
Just 2 comments cleaned
===
M CMakeLists.txt
M source/blender/editors/space_file/fsmenu.h
===
diff --git a/CMakeLists.txt b/CMakeLists.txt
index acf1bb4..b9e38c3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2049,7 +2049,7 @@ elseif(APPLE)
link_directories(${LIBDIR}/openmp/lib)
# This is a workaround for our helperbinaries (
datatoc, masgfmt, ... ),
# They are linked also to omp lib, so we need
it in builddir for runtime exexcution, TODO: remove all unneeded dependencies
from these
- execute_process(COMMAND ditto -arch
${CMAKE_OSX_ARCHITECTURES} ${LIBDIR}/openmp/lib/libiomp5.dylib
${CMAKE_BINARY_DIR}/Resources/lib/libiomp5.dylib) # for intermediate binaries,
lib id @loader_path
+ execute_process(COMMAND ditto -arch
${CMAKE_OSX_ARCHITECTURES} ${LIBDIR}/openmp/lib/libiomp5.dylib
${CMAKE_BINARY_DIR}/Resources/lib/libiomp5.dylib) # for intermediate binaries,
in respect to lib ID
endif()
endif()
endif()
diff --git a/source/blender/editors/space_file/fsmenu.h
b/source/blender/editors/space_file/fsmenu.h
index 8c4dd31..831ec13 100644
--- a/source/blender/editors/space_file/fsmenu.h
+++ b/source/blender/editors/space_file/fsmenu.h
@@ -48,7 +48,7 @@ typedef enum FSMenuInsert {
FS_INSERT_SORTED = (1 0),
FS_INSERT_SAVE = (1 1),
FS_INSERT_FIRST = (1 2), /* moves the item to the front of the
list when its not already there */
- FS_APPEND_LAST = (1 3) /*just append to preseve delivered order
*/
+ FS_APPEND_LAST = (1 3) /* just append to preseve delivered order
*/
} FSMenuInsert;
struct FSMenu;
___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] SVN commit: /data/svn/repos/bf-blender [61443] trunk/lib/ darwin-9.x.universal: OSX: add libGLEW
Revision: 61443 https://developer.blender.org/rBL61443 Author: jensverwiebe Date: 2014-11-16 19:40:59 + (Sun, 16 Nov 2014) Log Message: --- OSX: add libGLEW Modified Paths: -- trunk/lib/darwin-9.x.universal/osl/bin/oslc trunk/lib/darwin-9.x.universal/osl/bin/oslinfo trunk/lib/darwin-9.x.universal/osl/include/OSL/oslexec.h trunk/lib/darwin-9.x.universal/osl/lib/liboslcomp.a trunk/lib/darwin-9.x.universal/osl/lib/liboslexec.a trunk/lib/darwin-9.x.universal/osl/lib/liboslquery.a Added Paths: --- trunk/lib/darwin-9.x.universal/glew/ trunk/lib/darwin-9.x.universal/glew/include/ trunk/lib/darwin-9.x.universal/glew/include/GL/ trunk/lib/darwin-9.x.universal/glew/include/GL/glew.h trunk/lib/darwin-9.x.universal/glew/include/GL/glxew.h trunk/lib/darwin-9.x.universal/glew/include/GL/wglew.h trunk/lib/darwin-9.x.universal/glew/lib/ trunk/lib/darwin-9.x.universal/glew/lib/libGLEW.a Added: trunk/lib/darwin-9.x.universal/glew/include/GL/glew.h === --- trunk/lib/darwin-9.x.universal/glew/include/GL/glew.h (rev 0) +++ trunk/lib/darwin-9.x.universal/glew/include/GL/glew.h 2014-11-16 19:40:59 UTC (rev 61443) @@ -0,0 +1,14703 @@ +/* +** The OpenGL Extension Wrangler Library +** Copyright (C) 2002-2008, Milan Ikits milan ikits[]ieee org +** Copyright (C) 2002-2008, Marcelo E. Magallon mmagallo[]debian org +** Copyright (C) 2002, Lev Povalahev +** All rights reserved. +** +** Redistribution and use in source and binary forms, with or without +** modification, are permitted provided that the following conditions are met: +** +** * Redistributions of source code must retain the above copyright notice, +** this list of conditions and the following disclaimer. +** * Redistributions in binary form must reproduce the above copyright notice, +** this list of conditions and the following disclaimer in the documentation +** and/or other materials provided with the distribution. +** * The name of the author may be used to endorse or promote products +** derived from this software without specific prior written permission. +** +** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS AS IS +** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +** ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE +** LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR +** CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF +** SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +** INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN +** CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) +** ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF +** THE POSSIBILITY OF SUCH DAMAGE. +*/ + +/* + * Mesa 3-D graphics library + * Version: 7.0 + * + * Copyright (C) 1999-2007 Brian Paul All Rights Reserved. + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the Software), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included + * in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED AS IS, WITHOUT WARRANTY OF ANY KIND, EXPRESS + * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN + * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + +/* +** Copyright (c) 2007 The Khronos Group Inc. +** +** Permission is hereby granted, free of charge, to any person obtaining a +** copy of this software and/or associated documentation files (the +** Materials), to deal in the Materials without restriction, including +** without limitation the rights to use, copy, modify, merge, publish, +** distribute, sublicense, and/or sell copies of the Materials, and to +** permit persons to whom the Materials are furnished to do so, subject to +** the following conditions: +** +** The above copyright notice and this permission notice shall be included +** in all copies or substantial portions of the Materials. +** +** THE MATERIALS ARE PROVIDED AS IS, WITHOUT WARRANTY OF ANY KIND, +**
