[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [58332] branches/soc-2013-paint: Merge trunk -r58316 into soc-2013-paint
Antony Riakiotakis
kalast at gmail.com
Wed Jul 17 12:19:48 CEST 2013
Revision: 58332
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=58332
Author: psy-fi
Date: 2013-07-17 10:19:48 +0000 (Wed, 17 Jul 2013)
Log Message:
-----------
Merge trunk -r58316 into soc-2013-paint
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=58316
Modified Paths:
--------------
branches/soc-2013-paint/intern/ghost/intern/GHOST_DropTargetWin32.h
branches/soc-2013-paint/intern/ghost/intern/GHOST_DropTargetX11.cpp
branches/soc-2013-paint/intern/ghost/intern/GHOST_DropTargetX11.h
branches/soc-2013-paint/intern/smoke/CMakeLists.txt
branches/soc-2013-paint/release/scripts/modules/bl_i18n_utils/utils_spell_check.py
branches/soc-2013-paint/source/blender/blenkernel/intern/mesh.c
branches/soc-2013-paint/source/blender/blenkernel/intern/smoke.c
branches/soc-2013-paint/source/blender/blenlib/intern/fileops.c
branches/soc-2013-paint/source/blender/blenlib/intern/math_matrix.c
branches/soc-2013-paint/source/blender/blenlib/intern/string_utf8.c
branches/soc-2013-paint/source/blender/bmesh/operators/bmo_bridge.c
branches/soc-2013-paint/source/blender/bmesh/operators/bmo_subdivide_edgering.c
branches/soc-2013-paint/source/blender/editors/armature/armature_select.c
branches/soc-2013-paint/source/blender/editors/armature/armature_utils.c
branches/soc-2013-paint/source/blender/editors/curve/editfont.c
branches/soc-2013-paint/source/blender/editors/include/ED_armature.h
branches/soc-2013-paint/source/blender/editors/object/object_add.c
branches/soc-2013-paint/source/blender/editors/object/object_vgroup.c
branches/soc-2013-paint/source/blender/editors/render/render_internal.c
branches/soc-2013-paint/source/blender/editors/sculpt_paint/sculpt.c
branches/soc-2013-paint/source/blender/editors/sculpt_paint/sculpt_intern.h
branches/soc-2013-paint/source/blender/editors/space_clip/tracking_ops.c
branches/soc-2013-paint/source/blender/editors/space_outliner/outliner_select.c
branches/soc-2013-paint/source/blender/editors/space_outliner/outliner_tree.c
branches/soc-2013-paint/source/blender/editors/space_sequencer/sequencer_edit.c
branches/soc-2013-paint/source/blender/editors/space_view3d/view3d_buttons.c
branches/soc-2013-paint/source/blender/editors/space_view3d/view3d_draw.c
branches/soc-2013-paint/source/blender/makesrna/intern/makesrna.c
branches/soc-2013-paint/source/blender/modifiers/intern/MOD_cast.c
branches/soc-2013-paint/source/blender/modifiers/intern/MOD_cloth.c
branches/soc-2013-paint/source/blender/modifiers/intern/MOD_displace.c
branches/soc-2013-paint/source/blender/modifiers/intern/MOD_hook.c
branches/soc-2013-paint/source/blender/modifiers/intern/MOD_laplaciansmooth.c
branches/soc-2013-paint/source/blender/modifiers/intern/MOD_meshdeform.c
branches/soc-2013-paint/source/blender/modifiers/intern/MOD_particlesystem.c
branches/soc-2013-paint/source/blender/modifiers/intern/MOD_shrinkwrap.c
branches/soc-2013-paint/source/blender/modifiers/intern/MOD_simpledeform.c
branches/soc-2013-paint/source/blender/modifiers/intern/MOD_smooth.c
branches/soc-2013-paint/source/blender/modifiers/intern/MOD_surface.c
branches/soc-2013-paint/source/blender/modifiers/intern/MOD_util.c
branches/soc-2013-paint/source/blender/modifiers/intern/MOD_util.h
branches/soc-2013-paint/source/blender/modifiers/intern/MOD_warp.c
branches/soc-2013-paint/source/blender/modifiers/intern/MOD_wave.c
Modified: branches/soc-2013-paint/intern/ghost/intern/GHOST_DropTargetWin32.h
===================================================================
--- branches/soc-2013-paint/intern/ghost/intern/GHOST_DropTargetWin32.h 2013-07-17 09:57:02 UTC (rev 58331)
+++ branches/soc-2013-paint/intern/ghost/intern/GHOST_DropTargetWin32.h 2013-07-17 10:19:48 UTC (rev 58332)
@@ -152,6 +152,10 @@
GHOST_SystemWin32 *m_system;
/* Data type of the dragged object */
GHOST_TDragnDropTypes m_draggedObjectType;
+
+#ifdef WITH_CXX_GUARDEDALLOC
+ MEM_CXX_CLASS_ALLOC_FUNCS("GHOST:GHOST_DropTargetWin32")
+#endif
};
#endif // __GHOST_DROPTARGETWIN32_H__
Modified: branches/soc-2013-paint/intern/ghost/intern/GHOST_DropTargetX11.cpp
===================================================================
--- branches/soc-2013-paint/intern/ghost/intern/GHOST_DropTargetX11.cpp 2013-07-17 09:57:02 UTC (rev 58331)
+++ branches/soc-2013-paint/intern/ghost/intern/GHOST_DropTargetX11.cpp 2013-07-17 10:19:48 UTC (rev 58332)
@@ -84,6 +84,9 @@
void GHOST_DropTargetX11::Uninitialize(void)
{
xdnd_shut(&m_dndClass);
+
+ delete[] m_dndActions;
+ delete[] m_dndTypes;
}
GHOST_DropTargetX11::GHOST_DropTargetX11(GHOST_WindowX11 *window, GHOST_SystemX11 *system)
Modified: branches/soc-2013-paint/intern/ghost/intern/GHOST_DropTargetX11.h
===================================================================
--- branches/soc-2013-paint/intern/ghost/intern/GHOST_DropTargetX11.h 2013-07-17 09:57:02 UTC (rev 58331)
+++ branches/soc-2013-paint/intern/ghost/intern/GHOST_DropTargetX11.h 2013-07-17 10:19:48 UTC (rev 58332)
@@ -130,6 +130,10 @@
/* counter of references to global XDND structures */
static int m_refCounter;
+
+#ifdef WITH_CXX_GUARDEDALLOC
+ MEM_CXX_CLASS_ALLOC_FUNCS("GHOST:GHOST_DropTargetX11")
+#endif
};
#endif // __GHOST_DROPTARGETX11_H__
Modified: branches/soc-2013-paint/intern/smoke/CMakeLists.txt
===================================================================
--- branches/soc-2013-paint/intern/smoke/CMakeLists.txt 2013-07-17 09:57:02 UTC (rev 58331)
+++ branches/soc-2013-paint/intern/smoke/CMakeLists.txt 2013-07-17 10:19:48 UTC (rev 58332)
@@ -95,7 +95,7 @@
if(WITH_FFTW3)
add_definitions(-DWITH_FFTW3)
- list(APPEND INC
+ list(APPEND INC_SYS
${FFTW3_INCLUDE_DIRS}
)
endif()
Modified: branches/soc-2013-paint/release/scripts/modules/bl_i18n_utils/utils_spell_check.py
===================================================================
--- branches/soc-2013-paint/release/scripts/modules/bl_i18n_utils/utils_spell_check.py 2013-07-17 09:57:02 UTC (rev 58331)
+++ branches/soc-2013-paint/release/scripts/modules/bl_i18n_utils/utils_spell_check.py 2013-07-17 10:19:48 UTC (rev 58332)
@@ -40,6 +40,7 @@
"derivate",
"doesn", # doesn't
"fader",
+ "globbing",
"hasn", # hasn't
"hoc", # ad-hoc
"indices",
@@ -59,6 +60,7 @@
"autoclip",
"autocomplete",
"autoexec",
+ "autoexecution",
"autoname",
"autosave",
"autoscale",
Modified: branches/soc-2013-paint/source/blender/blenkernel/intern/mesh.c
===================================================================
--- branches/soc-2013-paint/source/blender/blenkernel/intern/mesh.c 2013-07-17 09:57:02 UTC (rev 58331)
+++ branches/soc-2013-paint/source/blender/blenkernel/intern/mesh.c 2013-07-17 10:19:48 UTC (rev 58332)
@@ -2463,10 +2463,11 @@
int totvert, int totpoly, int totloop)
{
MeshElemMap *map = MEM_callocN(sizeof(MeshElemMap) * totvert, "vert poly map");
- int *indices = MEM_mallocN(sizeof(int) * totloop, "vert poly map mem");
-
+ int *indices, *index_iter;
int i, j;
+ indices = index_iter = MEM_mallocN(sizeof(int) * totloop, "vert poly map mem");
+
/* Count number of polys for each vertex */
for (i = 0; i < totpoly; i++) {
const MPoly *p = &mpoly[i];
@@ -2477,8 +2478,8 @@
/* Assign indices mem */
for (i = 0; i < totvert; i++) {
- map[i].indices = indices;
- indices += map[i].count;
+ map[i].indices = index_iter;
+ index_iter += map[i].count;
/* Reset 'count' for use as index in last loop */
map[i].count = 0;
Modified: branches/soc-2013-paint/source/blender/blenkernel/intern/smoke.c
===================================================================
--- branches/soc-2013-paint/source/blender/blenkernel/intern/smoke.c 2013-07-17 09:57:02 UTC (rev 58331)
+++ branches/soc-2013-paint/source/blender/blenkernel/intern/smoke.c 2013-07-17 10:19:48 UTC (rev 58332)
@@ -2102,7 +2102,7 @@
/* sample subframes */
else {
int scene_frame = scene->r.cfra;
- float scene_subframe = scene->r.subframe;
+ // float scene_subframe = scene->r.subframe; // UNUSED
int subframe;
for (subframe = 0; subframe <= subframes; subframe++) {
EmissionMap em_temp = {0};
Modified: branches/soc-2013-paint/source/blender/blenlib/intern/fileops.c
===================================================================
--- branches/soc-2013-paint/source/blender/blenlib/intern/fileops.c 2013-07-17 09:57:02 UTC (rev 58331)
+++ branches/soc-2013-paint/source/blender/blenlib/intern/fileops.c 2013-07-17 10:19:48 UTC (rev 58332)
@@ -199,7 +199,7 @@
{
FILE *f = BLI_fopen(file, "r+b");
if (f != NULL) {
- char c = getc(f);
+ int c = getc(f);
rewind(f);
putc(c, f);
}
Modified: branches/soc-2013-paint/source/blender/blenlib/intern/math_matrix.c
===================================================================
--- branches/soc-2013-paint/source/blender/blenlib/intern/math_matrix.c 2013-07-17 09:57:02 UTC (rev 58331)
+++ branches/soc-2013-paint/source/blender/blenlib/intern/math_matrix.c 2013-07-17 10:19:48 UTC (rev 58332)
@@ -836,6 +836,7 @@
normalize_v3(mat[0]);
cross_v3_v3v3(mat[1], mat[2], mat[0]);
}
+ break;
default:
BLI_assert(0);
}
Modified: branches/soc-2013-paint/source/blender/blenlib/intern/string_utf8.c
===================================================================
--- branches/soc-2013-paint/source/blender/blenlib/intern/string_utf8.c 2013-07-17 09:57:02 UTC (rev 58331)
+++ branches/soc-2013-paint/source/blender/blenlib/intern/string_utf8.c 2013-07-17 10:19:48 UTC (rev 58332)
@@ -239,7 +239,7 @@
memset(dst, 0xff, sizeof(*dst) * maxncpy);
#endif
- while (*src && len != maxlen) { /* XXX can still run over the buffer because utf8 size isn't known :| */
+ while (*src && len < maxlen) { /* XXX can still run over the buffer because utf8 size isn't known :| */
len += BLI_str_utf8_from_unicode((unsigned int)*src++, dst + len);
}
Modified: branches/soc-2013-paint/source/blender/bmesh/operators/bmo_bridge.c
===================================================================
--- branches/soc-2013-paint/source/blender/bmesh/operators/bmo_bridge.c 2013-07-17 09:57:02 UTC (rev 58331)
+++ branches/soc-2013-paint/source/blender/bmesh/operators/bmo_bridge.c 2013-07-17 10:19:48 UTC (rev 58332)
@@ -162,7 +162,7 @@
}
if (use_merge) {
- BLI_assert((el_store_a_len == el_store_a_len));
+ BLI_assert((el_store_a_len == el_store_b_len));
}
if (el_store_a_len != el_store_b_len) {
Modified: branches/soc-2013-paint/source/blender/bmesh/operators/bmo_subdivide_edgering.c
===================================================================
--- branches/soc-2013-paint/source/blender/bmesh/operators/bmo_subdivide_edgering.c 2013-07-17 09:57:02 UTC (rev 58331)
+++ branches/soc-2013-paint/source/blender/bmesh/operators/bmo_subdivide_edgering.c 2013-07-17 10:19:48 UTC (rev 58332)
@@ -893,7 +893,7 @@
/* before going much further, get ourselves in order
* - align loops (not strictly necessary but handy)
* - ensure winding is set for both loops */
- if (BM_edgeloop_is_closed(el_store_a) && BM_edgeloop_is_closed(el_store_a)) {
+ if (BM_edgeloop_is_closed(el_store_a) && BM_edgeloop_is_closed(el_store_b)) {
BMIter eiter;
BMEdge *e;
BMVert *v_other;
Modified: branches/soc-2013-paint/source/blender/editors/armature/armature_select.c
===================================================================
--- branches/soc-2013-paint/source/blender/editors/armature/armature_select.c 2013-07-17 09:57:02 UTC (rev 58331)
+++ branches/soc-2013-paint/source/blender/editors/armature/armature_select.c 2013-07-17 10:19:48 UTC (rev 58332)
@@ -682,17 +682,7 @@
{0, NULL, 0, NULL, NULL}
};
-/* could be used in more places */
-static void ED_armature_edit_bone_select(EditBone *ebone)
-{
- BLI_assert((ebone->flag & BONE_UNSELECTABLE) == 0);
- ebone->flag |= (BONE_SELECTED | BONE_TIPSEL | BONE_ROOTSEL);
- if ((ebone->flag & BONE_CONNECTED) && (ebone->parent != NULL)) {
- ebone->parent->flag |= BONE_TIPSEL;
- }
-}
-
static void select_similar_length(bArmature *arm, EditBone *ebone_act, const float thresh)
{
EditBone *ebone;
@@ -706,7 +696,7 @@
if ((ebone->length >= len_min) &&
(ebone->length <= len_max))
{
- ED_armature_edit_bone_select(ebone);
+ ED_armature_ebone_select_set(ebone, true);
}
}
}
@@ -724,7 +714,7 @@
sub_v3_v3v3(dir, ebone->head, ebone->tail);
if (angle_v3v3(dir_act, dir) / (float)M_PI < thresh) {
- ED_armature_edit_bone_select(ebone);
+ ED_armature_ebone_select_set(ebone, true);
}
}
}
@@ -737,7 +727,7 @@
for (ebone = arm->edbo->first; ebone; ebone = ebone->next) {
if (EBONE_SELECTABLE(arm, ebone)) {
if (ebone->layer & ebone_act->layer) {
- ED_armature_edit_bone_select(ebone);
+ ED_armature_ebone_select_set(ebone, true);
}
}
}
@@ -760,8 +750,8 @@
if (EBONE_SELECTABLE(arm, ebone)) {
char prefix_other[MAX_VGROUP_NAME];
BKE_deform_split_prefix(ebone->name, prefix_other, body_tmp);
- if (!strcmp(prefix_act, prefix_other)) {
- ED_armature_edit_bone_select(ebone);
+ if (STREQ(prefix_act, prefix_other)) {
+ ED_armature_ebone_select_set(ebone, true);
}
}
}
@@ -784,8 +774,8 @@
if (EBONE_SELECTABLE(arm, ebone)) {
char suffix_other[MAX_VGROUP_NAME];
BKE_deform_split_suffix(ebone->name, body_tmp, suffix_other);
- if (!strcmp(suffix_act, suffix_other)) {
- ED_armature_edit_bone_select(ebone);
+ if (STREQ(suffix_act, suffix_other)) {
+ ED_armature_ebone_select_set(ebone, true);
}
}
}
Modified: branches/soc-2013-paint/source/blender/editors/armature/armature_utils.c
===================================================================
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list