Revision: 59766
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=59766
Author: nazgul
Date: 2013-09-03 10:43:27 +0000 (Tue, 03 Sep 2013)
Log Message:
-----------
Merging r59745 through r59765 from trunk into soc-2013-depsgraph_mt
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=59745
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=59765
Modified Paths:
--------------
branches/soc-2013-depsgraph_mt/intern/elbeem/CMakeLists.txt
branches/soc-2013-depsgraph_mt/intern/guardedalloc/intern/mallocn.c
branches/soc-2013-depsgraph_mt/source/CMakeLists.txt
branches/soc-2013-depsgraph_mt/source/blender/blenkernel/BKE_mesh.h
branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/constraint.c
branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/mesh.c
branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/tracking.c
branches/soc-2013-depsgraph_mt/source/blender/blenlib/BLI_edgehash.h
branches/soc-2013-depsgraph_mt/source/blender/blenlib/BLI_strict_flags.h
branches/soc-2013-depsgraph_mt/source/blender/blenlib/intern/BLI_ghash.c
branches/soc-2013-depsgraph_mt/source/blender/blenlib/intern/BLI_mempool.c
branches/soc-2013-depsgraph_mt/source/blender/bmesh/tools/bmesh_bisect_plane.c
branches/soc-2013-depsgraph_mt/source/blender/editors/animation/drivers.c
branches/soc-2013-depsgraph_mt/source/blender/editors/animation/keyframing.c
branches/soc-2013-depsgraph_mt/source/blender/editors/include/ED_keyframing.h
branches/soc-2013-depsgraph_mt/source/blender/editors/interface/interface.c
branches/soc-2013-depsgraph_mt/source/blender/editors/interface/interface_layout.c
branches/soc-2013-depsgraph_mt/source/blender/editors/object/object_transform.c
branches/soc-2013-depsgraph_mt/source/blender/editors/space_graph/graph_edit.c
branches/soc-2013-depsgraph_mt/source/blender/editors/space_graph/graph_select.c
branches/soc-2013-depsgraph_mt/source/blender/editors/space_sequencer/sequencer_view.c
branches/soc-2013-depsgraph_mt/source/blender/makesrna/intern/rna_constraint.c
branches/soc-2013-depsgraph_mt/source/blender/makesrna/intern/rna_define.c
branches/soc-2013-depsgraph_mt/source/blender/makesrna/intern/rna_mesh_api.c
branches/soc-2013-depsgraph_mt/source/blender/makesrna/intern/rna_modifier.c
branches/soc-2013-depsgraph_mt/source/blender/python/intern/bpy_interface.c
branches/soc-2013-depsgraph_mt/source/blender/python/intern/bpy_rna_anim.c
branches/soc-2013-depsgraph_mt/source/blender/windowmanager/intern/wm_event_system.c
Property Changed:
----------------
branches/soc-2013-depsgraph_mt/
branches/soc-2013-depsgraph_mt/source/blender/editors/interface/interface.c
branches/soc-2013-depsgraph_mt/source/blender/editors/space_outliner/
Property changes on: branches/soc-2013-depsgraph_mt
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/ge_dev:58091-58422
/branches/ge_harmony:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/branches/soc-2011-cucumber:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/soc-2011-tomato:42376,42378-42379,42383,42385,42395,42397-42400,42407,42411,42418,42443-42444,42446,42467,42472,42486,42650-42652,42654-42655,42709-42710,42733-42734,42801,43872,44130,44141,44147-44149,44151-44152,44229-44230,45623-45625,46037,48089,48092,48551-48552,48679,48790,48792-48793,49076,49087,49292,49294,49466,49894,50052,50126,52854-52856,54573,58822,58989
/branches/soc-2013-dingto:57424,57487,57507,57525,57599,57670,57918-57919,57981,58091,58245,58253,58587,58772,58774-58775,58828,58835,59032,59214,59220,59251,59601
/tags/blender-2.67b-release/blender:57122
/trunk/blender:57395-59744
+ /branches/ge_dev:58091-58422
/branches/ge_harmony:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/branches/soc-2011-cucumber:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/soc-2011-tomato:42376,42378-42379,42383,42385,42395,42397-42400,42407,42411,42418,42443-42444,42446,42467,42472,42486,42650-42652,42654-42655,42709-42710,42733-42734,42801,43872,44130,44141,44147-44149,44151-44152,44229-44230,45623-45625,46037,48089,48092,48551-48552,48679,48790,48792-48793,49076,49087,49292,49294,49466,49894,50052,50126,52854-52856,54573,58822,58989
/branches/soc-2013-dingto:57424,57487,57507,57525,57599,57670,57918-57919,57981,58091,58245,58253,58587,58772,58774-58775,58828,58835,59032,59214,59220,59251,59601
/tags/blender-2.67b-release/blender:57122
/trunk/blender:57395-59765
Modified: branches/soc-2013-depsgraph_mt/intern/elbeem/CMakeLists.txt
===================================================================
--- branches/soc-2013-depsgraph_mt/intern/elbeem/CMakeLists.txt 2013-09-03
10:39:55 UTC (rev 59765)
+++ branches/soc-2013-depsgraph_mt/intern/elbeem/CMakeLists.txt 2013-09-03
10:43:27 UTC (rev 59766)
@@ -106,10 +106,6 @@
-DNEWDIRVELMOTEST=0
)
-if(WINDOWS)
- add_definitions(-DUSE_MSVC6FIXES)
-endif()
-
if(WITH_OPENMP)
add_definitions(-DPARALLEL=1)
else()
Modified: branches/soc-2013-depsgraph_mt/intern/guardedalloc/intern/mallocn.c
===================================================================
--- branches/soc-2013-depsgraph_mt/intern/guardedalloc/intern/mallocn.c
2013-09-03 10:39:55 UTC (rev 59765)
+++ branches/soc-2013-depsgraph_mt/intern/guardedalloc/intern/mallocn.c
2013-09-03 10:43:27 UTC (rev 59766)
@@ -37,9 +37,6 @@
#include <stdarg.h>
#include <sys/types.h>
-/* to ensure strict conversions */
-#include "../../source/blender/blenlib/BLI_strict_flags.h"
-
/* mmap exception */
#if defined(WIN32)
# include "mmap_win.h"
@@ -59,6 +56,10 @@
#include "MEM_guardedalloc.h"
+/* to ensure strict conversions */
+#include "../../source/blender/blenlib/BLI_strict_flags.h"
+
+
/* should always be defined except for experimental cases */
#ifdef WITH_GUARDEDALLOC
Modified: branches/soc-2013-depsgraph_mt/source/CMakeLists.txt
===================================================================
--- branches/soc-2013-depsgraph_mt/source/CMakeLists.txt 2013-09-03
10:39:55 UTC (rev 59765)
+++ branches/soc-2013-depsgraph_mt/source/CMakeLists.txt 2013-09-03
10:43:27 UTC (rev 59766)
@@ -28,9 +28,5 @@
if(WITH_GAMEENGINE)
add_subdirectory(gameengine)
endif()
-
-if(WINDOWS)
- add_subdirectory(icons)
-endif()
add_subdirectory(tests)
Modified: branches/soc-2013-depsgraph_mt/source/blender/blenkernel/BKE_mesh.h
===================================================================
--- branches/soc-2013-depsgraph_mt/source/blender/blenkernel/BKE_mesh.h
2013-09-03 10:39:55 UTC (rev 59765)
+++ branches/soc-2013-depsgraph_mt/source/blender/blenkernel/BKE_mesh.h
2013-09-03 10:43:27 UTC (rev 59766)
@@ -108,7 +108,7 @@
int *BKE_mesh_calc_smoothgroups(const struct MEdge *medge, const int totedge,
const struct MPoly *mpoly, const int totpoly,
const struct MLoop *mloop, const int totloop,
- int *r_totgroup);
+ int *r_totgroup, const bool use_bitflags);
void BKE_mesh_calc_relative_deform(
const struct MPoly *mpoly, const int totpoly,
Modified:
branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/constraint.c
===================================================================
---
branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/constraint.c
2013-09-03 10:39:55 UTC (rev 59765)
+++
branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/constraint.c
2013-09-03 10:43:27 UTC (rev 59766)
@@ -3392,14 +3392,12 @@
if (scon->projAxis &
MOD_SHRINKWRAP_PROJECT_OVER_Y_AXIS) no[1] = 1.0f;
if (scon->projAxis &
MOD_SHRINKWRAP_PROJECT_OVER_Z_AXIS) no[2] = 1.0f;
- if (dot_v3v3(no, no) < FLT_EPSILON) {
+ if (normalize_v3(no) < FLT_EPSILON) {
fail = TRUE;
break;
}
- normalize_v3(no);
-
bvhtree_from_mesh_faces(&treeData,
target, scon->dist, 4, 6);
if (treeData.tree == NULL) {
fail = TRUE;
Modified: branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/mesh.c
===================================================================
--- branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/mesh.c
2013-09-03 10:39:55 UTC (rev 59765)
+++ branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/mesh.c
2013-09-03 10:43:27 UTC (rev 59766)
@@ -3312,12 +3312,12 @@
* Calculate smooth groups from sharp edges.
*
* \param r_totgroup The total number of groups, 1 or more.
- * \return Polygon aligned array of group index values (bitflags, starting at
1).
+ * \return Polygon aligned array of group index values (bitflags if
use_bitflags is true), starting at 1.
*/
int *BKE_mesh_calc_smoothgroups(const MEdge *medge, const int totedge,
const MPoly *mpoly, const int totpoly,
const MLoop *mloop, const int totloop,
- int *r_totgroup)
+ int *r_totgroup, const bool use_bitflags)
{
int *poly_groups;
int *poly_stack;
@@ -3348,6 +3348,7 @@
while (true) {
int poly;
int bit_poly_group_mask = 0;
+ int poly_group_id;
int ps_curr_idx = 0, ps_end_idx = 0; /* stack indices */
for (poly = poly_prev; poly < totpoly; poly++) {
@@ -3361,10 +3362,12 @@
break;
}
+ poly_group_id = use_bitflags ? temp_poly_group_id : ++tot_group;
+
/* start searching from here next time */
poly_prev = poly + 1;
- poly_groups[poly] = temp_poly_group_id;
+ poly_groups[poly] = poly_group_id;
poly_stack[ps_end_idx++] = poly;
while (ps_curr_idx != ps_end_idx) {
@@ -3373,7 +3376,7 @@
int j;
poly = poly_stack[ps_curr_idx++];
- BLI_assert(poly_groups[poly] == temp_poly_group_id);
+ BLI_assert(poly_groups[poly] == poly_group_id);
mp = &mpoly[poly];
for (ml = &mloop[mp->loopstart], j = mp->totloop; j--;
ml++) {
@@ -3384,19 +3387,19 @@
if (!(medge[ml->e].flag & ME_SHARP)) {
for (; i--; p++) {
/* if we meet other non
initialized its a bug */
-
BLI_assert(ELEM(poly_groups[*p], 0, temp_poly_group_id));
+
BLI_assert(ELEM(poly_groups[*p], 0, poly_group_id));
if (poly_groups[*p] == 0) {
- poly_groups[*p] =
temp_poly_group_id;
+ poly_groups[*p] =
poly_group_id;
poly_stack[ps_end_idx++] = *p;
}
}
}
- else {
+ else if (use_bitflags) {
/* Find contiguous smooth groups
already assigned, these are the values we can't reuse! */
for (; i--; p++) {
int bit = poly_groups[*p];
- if (!ELEM3(bit, 0,
temp_poly_group_id, poly_group_id_overflowed) &&
+ if (!ELEM3(bit, 0,
poly_group_id, poly_group_id_overflowed) &&
!(bit_poly_group_mask &
bit))
{
bit_poly_group_mask |=
bit;
@@ -3408,8 +3411,9 @@
/* And now, we have all our poly from current group in
poly_stack (from 0 to (ps_end_idx - 1)), as well as
* all smoothgroups bits we can't use in bit_poly_group_mask.
*/
- {
- int i, *p, gid_bit = 0, poly_group_id = 1;
+ if (use_bitflags) {
+ int i, *p, gid_bit = 0;
+ poly_group_id = 1;
/* Find first bit available! */
for (; (poly_group_id & bit_poly_group_mask) &&
(gid_bit < 32); gid_bit++) {
Modified:
branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/tracking.c
===================================================================
--- branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/tracking.c
2013-09-03 10:39:55 UTC (rev 59765)
+++ branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/tracking.c
2013-09-03 10:43:27 UTC (rev 59766)
@@ -2417,7 +2417,6 @@
* of currently operating tracks (if needed)
*/
for (a = 0; a < map->num_tracks; a++) {
- int replace_sel = 0, replace_rot = 0;
MovieTrackingTrack *new_track, *old_track;
track = &map->tracks[a];
@@ -2427,7 +2426,7 @@
/* find original of operating track in list of previously
displayed tracks */
old_track = BLI_ghash_lookup(map->hash, track);
if (old_track) {
- if (BLI_findindex(old_tracks->first, old_track) != -1) {
+ if (BLI_findindex(old_tracks, old_track) != -1) {
/* Update active track in movie clip. */
if (old_track == act_track) {
tracking->act_track = new_track;
@@ -2901,19 +2900,24 @@
static bool tracking_check_marker_margin(MovieTrackingTrack *track,
MovieTrackingMarker *marker,
int frame_width, int frame_height)
{
- float pat_min[2], pat_max[2], dim[2], margin[2];
+ float pat_min[2], pat_max[2];
+ float margin_left, margin_top, margin_right, margin_bottom;
+ float normalized_track_margin[2];
/* margin from frame boundaries */
BKE_tracking_marker_pattern_minmax(marker, pat_min, pat_max);
- sub_v2_v2v2(dim, pat_max, pat_min);
- margin[0] = margin[1] = max_ff(dim[0], dim[1]) / 2.0f;
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
