[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [51190] tags/blender-2.64a-release/blender : Merging different fixes from trunk into 2.64a tag
Sergey Sharybin
sergey.vfx at gmail.com
Mon Oct 8 16:40:15 CEST 2012
Revision: 51190
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=51190
Author: nazgul
Date: 2012-10-08 14:40:15 +0000 (Mon, 08 Oct 2012)
Log Message:
-----------
Merging different fixes from trunk into 2.64a tag
This includes revisions: 51050, 51057, 51070, 51072, 51074,
51075, 51083, 51084, 51105, 51106,
51111, 51112, 51143, 51149, 51162,
51185.
Modified Paths:
--------------
tags/blender-2.64a-release/blender/intern/bsp/intern/BOP_CarveInterface.cpp
tags/blender-2.64a-release/blender/release/scripts/startup/bl_ui/space_info.py
tags/blender-2.64a-release/blender/source/blender/blenkernel/BKE_mball.h
tags/blender-2.64a-release/blender/source/blender/blenkernel/BKE_sequencer.h
tags/blender-2.64a-release/blender/source/blender/blenkernel/intern/image.c
tags/blender-2.64a-release/blender/source/blender/blenkernel/intern/implicit.c
tags/blender-2.64a-release/blender/source/blender/blenkernel/intern/mball.c
tags/blender-2.64a-release/blender/source/blender/blenkernel/intern/sequencer.c
tags/blender-2.64a-release/blender/source/blender/blenlib/intern/fileops.c
tags/blender-2.64a-release/blender/source/blender/blenlib/intern/math_vector_inline.c
tags/blender-2.64a-release/blender/source/blender/blenloader/intern/readfile.c
tags/blender-2.64a-release/blender/source/blender/blenloader/intern/versioning_250.c
tags/blender-2.64a-release/blender/source/blender/collada/DocumentExporter.cpp
tags/blender-2.64a-release/blender/source/blender/editors/interface/interface_templates.c
tags/blender-2.64a-release/blender/source/blender/editors/mesh/editmesh_knife.c
tags/blender-2.64a-release/blender/source/blender/editors/mesh/editmesh_rip.c
tags/blender-2.64a-release/blender/source/blender/editors/mesh/editmesh_select.c
tags/blender-2.64a-release/blender/source/blender/editors/sculpt_paint/paint_utils.c
tags/blender-2.64a-release/blender/source/blender/editors/space_clip/clip_draw.c
tags/blender-2.64a-release/blender/source/blender/editors/space_file/file_ops.c
tags/blender-2.64a-release/blender/source/blender/editors/space_sequencer/sequencer_add.c
tags/blender-2.64a-release/blender/source/blender/editors/space_sequencer/sequencer_draw.c
tags/blender-2.64a-release/blender/source/blender/editors/space_sequencer/sequencer_edit.c
tags/blender-2.64a-release/blender/source/blender/editors/space_sequencer/sequencer_select.c
tags/blender-2.64a-release/blender/source/blender/editors/space_view3d/drawanimviz.c
tags/blender-2.64a-release/blender/source/blender/editors/space_view3d/drawobject.c
tags/blender-2.64a-release/blender/source/blender/editors/transform/transform_generics.c
tags/blender-2.64a-release/blender/source/blender/editors/uvedit/uvedit_ops.c
tags/blender-2.64a-release/blender/source/blender/ikplugin/intern/itasc_plugin.cpp
tags/blender-2.64a-release/blender/source/blender/makesrna/intern/rna_constraint.c
tags/blender-2.64a-release/blender/source/blender/makesrna/intern/rna_sequencer.c
tags/blender-2.64a-release/blender/source/blender/makesrna/intern/rna_sequencer_api.c
tags/blender-2.64a-release/blender/source/blender/python/generic/py_capi_utils.c
tags/blender-2.64a-release/blender/source/blender/render/intern/include/texture.h
tags/blender-2.64a-release/blender/source/blender/render/intern/source/imagetexture.c
tags/blender-2.64a-release/blender/source/blender/windowmanager/intern/wm_window.c
Property Changed:
----------------
tags/blender-2.64a-release/blender/
tags/blender-2.64a-release/blender/source/blender/editors/interface/interface.c
tags/blender-2.64a-release/blender/source/blender/editors/space_outliner/
Property changes on: tags/blender-2.64a-release/blender
___________________________________________________________________
Modified: svn:mergeinfo
- /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
/trunk/blender:51017-51025,51041-51043,51056,51060,51076,51079-51081,51108,51132,51158,51168,51181,51184,51186
+ /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
/trunk/blender:51017-51025,51041-51043,51050,51056-51057,51060,51072,51074-51076,51079-51081,51083-51084,51105-51106,51108,51111-51112,51132,51143,51149,51158,51162,51168,51181,51184-51186
Modified: tags/blender-2.64a-release/blender/intern/bsp/intern/BOP_CarveInterface.cpp
===================================================================
--- tags/blender-2.64a-release/blender/intern/bsp/intern/BOP_CarveInterface.cpp 2012-10-08 14:11:04 UTC (rev 51189)
+++ tags/blender-2.64a-release/blender/intern/bsp/intern/BOP_CarveInterface.cpp 2012-10-08 14:40:15 UTC (rev 51190)
@@ -58,7 +58,7 @@
cross = carve::geom::cross(vec1, vec2);
float production = carve::geom::dot(cross, vec3);
- float magnitude = 1e-6 * cross.length();
+ float magnitude = 1e-5 * cross.length();
return fabs(production) < magnitude;
}
Modified: tags/blender-2.64a-release/blender/release/scripts/startup/bl_ui/space_info.py
===================================================================
--- tags/blender-2.64a-release/blender/release/scripts/startup/bl_ui/space_info.py 2012-10-08 14:11:04 UTC (rev 51189)
+++ tags/blender-2.64a-release/blender/release/scripts/startup/bl_ui/space_info.py 2012-10-08 14:40:15 UTC (rev 51190)
@@ -289,8 +289,11 @@
layout.separator()
layout.menu("INFO_MT_armature_add", icon='OUTLINER_OB_ARMATURE')
+ # XXX Quick fix for [#32764].
+ layout.operator_context = 'INVOKE_REGION_WIN'
layout.operator("object.add", text="Lattice", icon='OUTLINER_OB_LATTICE').type = 'LATTICE'
layout.operator("object.add", text="Empty", icon='OUTLINER_OB_EMPTY').type = 'EMPTY'
+ layout.operator_context = 'EXEC_REGION_WIN'
layout.separator()
layout.operator("object.speaker_add", text="Speaker", icon='OUTLINER_OB_SPEAKER')
Modified: tags/blender-2.64a-release/blender/source/blender/blenkernel/BKE_mball.h
===================================================================
--- tags/blender-2.64a-release/blender/source/blender/blenkernel/BKE_mball.h 2012-10-08 14:11:04 UTC (rev 51189)
+++ tags/blender-2.64a-release/blender/source/blender/blenkernel/BKE_mball.h 2012-10-08 14:40:15 UTC (rev 51190)
@@ -59,7 +59,7 @@
int BKE_mball_minmax(struct MetaBall *mb, float min[3], float max[3]);
int BKE_mball_center_median(struct MetaBall *mb, float r_cent[3]);
int BKE_mball_center_bounds(struct MetaBall *mb, float r_cent[3]);
-void BKE_mball_translate(struct MetaBall *mb, float offset[3]);
+void BKE_mball_translate(struct MetaBall *mb, const float offset[3]);
struct MetaElem *BKE_mball_element_add(struct MetaBall *mb, const int type);
Modified: tags/blender-2.64a-release/blender/source/blender/blenkernel/BKE_sequencer.h
===================================================================
--- tags/blender-2.64a-release/blender/source/blender/blenkernel/BKE_sequencer.h 2012-10-08 14:11:04 UTC (rev 51189)
+++ tags/blender-2.64a-release/blender/source/blender/blenkernel/BKE_sequencer.h 2012-10-08 14:40:15 UTC (rev 51190)
@@ -64,29 +64,29 @@
int valid;
} SeqIterator;
-void BKE_seqence_iterator_begin(struct Editing *ed, SeqIterator *iter, int use_pointer);
-void BKE_seqence_iterator_next(SeqIterator *iter);
-void BKE_seqence_iterator_end(SeqIterator *iter);
+void BKE_sequence_iterator_begin(struct Editing *ed, SeqIterator *iter, int use_pointer);
+void BKE_sequence_iterator_next(SeqIterator *iter);
+void BKE_sequence_iterator_end(SeqIterator *iter);
#define SEQP_BEGIN(ed, _seq) \
{ \
SeqIterator iter; \
- for (BKE_seqence_iterator_begin(ed, &iter, 1); \
+ for (BKE_sequence_iterator_begin(ed, &iter, 1); \
iter.valid; \
- BKE_seqence_iterator_next(&iter)) { \
+ BKE_sequence_iterator_next(&iter)) { \
_seq = iter.seq;
#define SEQ_BEGIN(ed, _seq) \
{ \
SeqIterator iter; \
- for (BKE_seqence_iterator_begin(ed, &iter, 0); \
+ for (BKE_sequence_iterator_begin(ed, &iter, 0); \
iter.valid; \
- BKE_seqence_iterator_next(&iter)) { \
+ BKE_sequence_iterator_next(&iter)) { \
_seq = iter.seq;
#define SEQ_END \
} \
- BKE_seqence_iterator_end(&iter); \
+ BKE_sequence_iterator_end(&iter); \
}
typedef struct SeqRenderData {
@@ -307,7 +307,7 @@
int BKE_sequence_check_depend(struct Sequence *seq, struct Sequence *cur);
void BKE_sequence_invalidate_cache(struct Scene *scene, struct Sequence *seq);
-void BKE_sequence_invalidate_deendent(struct Scene *scene, struct Sequence *seq);
+void BKE_sequence_invalidate_dependent(struct Scene *scene, struct Sequence *seq);
void BKE_sequence_invalidate_cache_for_modifier(struct Scene *scene, struct Sequence *seq);
void BKE_sequencer_update_sound_bounds_all(struct Scene *scene);
@@ -315,9 +315,9 @@
void BKE_sequencer_update_muting(struct Editing *ed);
void BKE_sequencer_update_sound(struct Scene *scene, struct bSound *sound);
-void BKE_seqence_base_unique_name_recursive(ListBase *seqbasep, struct Sequence *seq);
+void BKE_sequence_base_unique_name_recursive(ListBase *seqbasep, struct Sequence *seq);
void BKE_sequence_base_dupli_recursive(struct Scene *scene, struct Scene *scene_to, ListBase *nseqbase, ListBase *seqbase, int dupe_flag);
-int BKE_seqence_is_valid_check(struct Sequence *seq);
+int BKE_sequence_is_valid_check(struct Sequence *seq);
void BKE_sequencer_clear_scene_in_allseqs(struct Main *bmain, struct Scene *sce);
Modified: tags/blender-2.64a-release/blender/source/blender/blenkernel/intern/image.c
===================================================================
--- tags/blender-2.64a-release/blender/source/blender/blenkernel/intern/image.c 2012-10-08 14:11:04 UTC (rev 51189)
+++ tags/blender-2.64a-release/blender/source/blender/blenkernel/intern/image.c 2012-10-08 14:40:15 UTC (rev 51190)
@@ -2563,7 +2563,7 @@
*lock_r = re;
}
- /* this gives active layer, composite or seqence result */
+ /* this gives active layer, composite or sequence result */
rect = (unsigned int *)rres.rect32;
rectf = rres.rectf;
rectz = rres.rectz;
Modified: tags/blender-2.64a-release/blender/source/blender/blenkernel/intern/implicit.c
===================================================================
--- tags/blender-2.64a-release/blender/source/blender/blenkernel/intern/implicit.c 2012-10-08 14:11:04 UTC (rev 51189)
+++ tags/blender-2.64a-release/blender/source/blender/blenkernel/intern/implicit.c 2012-10-08 14:40:15 UTC (rev 51190)
@@ -1450,7 +1450,7 @@
i = HAIR_GRID_INDEX(lX[v], gmin, gmax, 0);
j = HAIR_GRID_INDEX(lX[v], gmin, gmax, 1);
k = HAIR_GRID_INDEX(lX[v], gmin, gmax, 2);
- if (i < 0 || j < 0 || k < 0 || i > 10 || j >= 10 || k >= 10)
+ if (i < 0 || j < 0 || k < 0 || i >= 10 || j >= 10 || k >= 10)
continue;
grid[i][j][k].velocity[0] += lV[v][0];
Modified: tags/blender-2.64a-release/blender/source/blender/blenkernel/intern/mball.c
===================================================================
--- tags/blender-2.64a-release/blender/source/blender/blenkernel/intern/mball.c 2012-10-08 14:11:04 UTC (rev 51189)
+++ tags/blender-2.64a-release/blender/source/blender/blenkernel/intern/mball.c 2012-10-08 14:40:15 UTC (rev 51190)
@@ -2388,7 +2388,7 @@
return 0;
}
-void BKE_mball_translate(MetaBall *mb, float offset[3])
+void BKE_mball_translate(MetaBall *mb, const float offset[3])
{
MetaElem *ml;
Modified: tags/blender-2.64a-release/blender/source/blender/blenkernel/intern/sequencer.c
===================================================================
--- tags/blender-2.64a-release/blender/source/blender/blenkernel/intern/sequencer.c 2012-10-08 14:11:04 UTC (rev 51189)
+++ tags/blender-2.64a-release/blender/source/blender/blenkernel/intern/sequencer.c 2012-10-08 14:40:15 UTC (rev 51190)
@@ -461,7 +461,7 @@
seq_build_array(&ed->seqbase, &array, 0);
}
-void BKE_seqence_iterator_begin(Editing *ed, SeqIterator *iter, int use_pointer)
+void BKE_sequence_iterator_begin(Editing *ed, SeqIterator *iter, int use_pointer)
{
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list