[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [48750] branches/soc-2011-tomato: Merging r48740 through r48749 from trunk into soc-2011-tomato
Sergey Sharybin
sergey.vfx at gmail.com
Mon Jul 9 12:33:11 CEST 2012
Revision: 48750
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=48750
Author: nazgul
Date: 2012-07-09 10:33:09 +0000 (Mon, 09 Jul 2012)
Log Message:
-----------
Merging r48740 through r48749 from trunk into soc-2011-tomato
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=48740
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=48749
Modified Paths:
--------------
branches/soc-2011-tomato/doc/python_api/rst/bge.types.rst
branches/soc-2011-tomato/source/blender/blenfont/BLF_api.h
branches/soc-2011-tomato/source/blender/blenfont/intern/blf.c
branches/soc-2011-tomato/source/blender/blenfont/intern/blf_font.c
branches/soc-2011-tomato/source/blender/blenfont/intern/blf_internal.h
branches/soc-2011-tomato/source/blender/blenkernel/intern/movieclip.c
branches/soc-2011-tomato/source/blender/bmesh/intern/bmesh_queries.c
branches/soc-2011-tomato/source/blender/collada/EffectExporter.cpp
branches/soc-2011-tomato/source/blender/editors/include/ED_armature.h
branches/soc-2011-tomato/source/blender/editors/space_view3d/drawanimviz.c
branches/soc-2011-tomato/source/blender/editors/space_view3d/drawarmature.c
branches/soc-2011-tomato/source/blender/editors/space_view3d/drawmesh.c
branches/soc-2011-tomato/source/blender/editors/space_view3d/drawobject.c
branches/soc-2011-tomato/source/blender/editors/space_view3d/drawvolume.c
branches/soc-2011-tomato/source/blender/editors/space_view3d/space_view3d.c
branches/soc-2011-tomato/source/blender/editors/space_view3d/view3d_draw.c
branches/soc-2011-tomato/source/blender/editors/space_view3d/view3d_edit.c
branches/soc-2011-tomato/source/blender/editors/space_view3d/view3d_fly.c
branches/soc-2011-tomato/source/blender/editors/space_view3d/view3d_header.c
branches/soc-2011-tomato/source/blender/editors/space_view3d/view3d_select.c
branches/soc-2011-tomato/source/blender/editors/space_view3d/view3d_snap.c
branches/soc-2011-tomato/source/blender/editors/space_view3d/view3d_view.c
branches/soc-2011-tomato/source/blender/render/intern/source/shadeinput.c
branches/soc-2011-tomato/source/gameengine/Ketsji/KX_BulletPhysicsController.cpp
branches/soc-2011-tomato/source/gameengine/Ketsji/KX_ConvertPhysicsObjects.cpp
branches/soc-2011-tomato/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp
branches/soc-2011-tomato/source/gameengine/Physics/Bullet/CcdPhysicsController.h
branches/soc-2011-tomato/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp
branches/soc-2011-tomato/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.h
Property Changed:
----------------
branches/soc-2011-tomato/
branches/soc-2011-tomato/source/blender/editors/interface/interface.c
branches/soc-2011-tomato/source/blender/editors/space_outliner/
Property changes on: branches/soc-2011-tomato
___________________________________________________________________
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/vgroup_modifiers:38694-39989
/trunk/blender:36831-48739
+ /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/vgroup_modifiers:38694-39989
/trunk/blender:36831-48749
Modified: branches/soc-2011-tomato/doc/python_api/rst/bge.types.rst
===================================================================
--- branches/soc-2011-tomato/doc/python_api/rst/bge.types.rst 2012-07-09 10:26:01 UTC (rev 48749)
+++ branches/soc-2011-tomato/doc/python_api/rst/bge.types.rst 2012-07-09 10:33:09 UTC (rev 48750)
@@ -1335,18 +1335,10 @@
Rigid body physics allows the object to roll on collisions.
- .. note::
-
- This is not working with bullet physics yet.
-
.. method:: disableRigidBody()
Disables rigid body physics for this object.
- .. note::
-
- This is not working with bullet physics yet. The angular is removed but rigid body physics can still rotate it later.
-
.. method:: setParent(parent, compound=True, ghost=True)
Sets this object's parent.
Modified: branches/soc-2011-tomato/source/blender/blenfont/BLF_api.h
===================================================================
--- branches/soc-2011-tomato/source/blender/blenfont/BLF_api.h 2012-07-09 10:26:01 UTC (rev 48749)
+++ branches/soc-2011-tomato/source/blender/blenfont/BLF_api.h 2012-07-09 10:33:09 UTC (rev 48750)
@@ -40,10 +40,10 @@
void BLF_cache_clear(void);
int BLF_load(const char *name);
-int BLF_load_mem(const char *name, unsigned char *mem, int mem_size);
+int BLF_load_mem(const char *name, const unsigned char *mem, int mem_size);
int BLF_load_unique(const char *name);
-int BLF_load_mem_unique(const char *name, unsigned char *mem, int mem_size);
+int BLF_load_mem_unique(const char *name, const unsigned char *mem, int mem_size);
void BLF_unload(const char *name);
Modified: branches/soc-2011-tomato/source/blender/blenfont/intern/blf.c
===================================================================
--- branches/soc-2011-tomato/source/blender/blenfont/intern/blf.c 2012-07-09 10:26:01 UTC (rev 48749)
+++ branches/soc-2011-tomato/source/blender/blenfont/intern/blf.c 2012-07-09 10:33:09 UTC (rev 48750)
@@ -227,7 +227,7 @@
}
}
-int BLF_load_mem(const char *name, unsigned char *mem, int mem_size)
+int BLF_load_mem(const char *name, const unsigned char *mem, int mem_size)
{
FontBLF *font;
int i;
@@ -262,7 +262,7 @@
return i;
}
-int BLF_load_mem_unique(const char *name, unsigned char *mem, int mem_size)
+int BLF_load_mem_unique(const char *name, const unsigned char *mem, int mem_size)
{
FontBLF *font;
int i;
Modified: branches/soc-2011-tomato/source/blender/blenfont/intern/blf_font.c
===================================================================
--- branches/soc-2011-tomato/source/blender/blenfont/intern/blf_font.c 2012-07-09 10:26:01 UTC (rev 48749)
+++ branches/soc-2011-tomato/source/blender/blenfont/intern/blf_font.c 2012-07-09 10:33:09 UTC (rev 48750)
@@ -560,12 +560,12 @@
FT_Open_Args open;
open.flags = FT_OPEN_MEMORY;
- open.memory_base = (FT_Byte *)mem;
+ open.memory_base = (const FT_Byte *)mem;
open.memory_size = mem_size;
FT_Attach_Stream(font->face, &open);
}
-FontBLF *blf_font_new_from_mem(const char *name, unsigned char *mem, int mem_size)
+FontBLF *blf_font_new_from_mem(const char *name, const unsigned char *mem, int mem_size)
{
FontBLF *font;
FT_Error err;
Modified: branches/soc-2011-tomato/source/blender/blenfont/intern/blf_internal.h
===================================================================
--- branches/soc-2011-tomato/source/blender/blenfont/intern/blf_internal.h 2012-07-09 10:26:01 UTC (rev 48749)
+++ branches/soc-2011-tomato/source/blender/blenfont/intern/blf_internal.h 2012-07-09 10:33:09 UTC (rev 48750)
@@ -47,7 +47,7 @@
void blf_font_exit(void);
struct FontBLF *blf_font_new(const char *name, const char *filename);
-struct FontBLF *blf_font_new_from_mem(const char *name, unsigned char *mem, int mem_size);
+struct FontBLF *blf_font_new_from_mem(const char *name, const unsigned char *mem, int mem_size);
void blf_font_attach_from_mem(struct FontBLF *font, const unsigned char *mem, int mem_size);
void blf_font_size(struct FontBLF *font, int size, int dpi);
Modified: branches/soc-2011-tomato/source/blender/blenkernel/intern/movieclip.c
===================================================================
--- branches/soc-2011-tomato/source/blender/blenkernel/intern/movieclip.c 2012-07-09 10:26:01 UTC (rev 48749)
+++ branches/soc-2011-tomato/source/blender/blenkernel/intern/movieclip.c 2012-07-09 10:33:09 UTC (rev 48750)
@@ -322,6 +322,8 @@
/* cache for stable shot */
struct {
+ ImBuf *reference_ibuf;
+
ImBuf *ibuf;
int framenr;
int postprocess_flag;
@@ -695,9 +697,6 @@
MovieTrackingCamera *camera = &clip->tracking.camera;
ImBuf *postproc_ibuf = NULL;
- if (cache->postprocessed.ibuf)
- IMB_freeImBuf(cache->postprocessed.ibuf);
-
cache->postprocessed.framenr = user->framenr;
cache->postprocessed.flag = postprocess_flag;
@@ -735,14 +734,11 @@
IMB_refImBuf(postproc_ibuf);
+ if (cache->postprocessed.ibuf)
+ IMB_freeImBuf(cache->postprocessed.ibuf);
+
cache->postprocessed.ibuf = postproc_ibuf;
- if (cache->stabilized.ibuf) {
- /* force stable buffer be re-calculated */
- IMB_freeImBuf(cache->stabilized.ibuf);
- cache->stabilized.ibuf = NULL;
- }
-
return postproc_ibuf;
}
@@ -817,7 +813,8 @@
return movieclip_get_postprocessed_ibuf(clip, user, clip->flag, postprocess_flag, 0);
}
-static ImBuf *get_stable_cached_frame(MovieClip *clip, MovieClipUser *user, int framenr, int postprocess_flag)
+static ImBuf *get_stable_cached_frame(MovieClip *clip, MovieClipUser *user, ImBuf *reference_ibuf,
+ int framenr, int postprocess_flag)
{
MovieClipCache *cache = clip->cache;
MovieTracking *tracking = &clip->tracking;
@@ -836,6 +833,9 @@
if (!cache->stabilized.ibuf || cache->stabilized.framenr != framenr)
return NULL;
+ if (cache->stabilized.reference_ibuf != reference_ibuf)
+ return NULL;
+
/* cached ibuf used different proxy settings */
if (cache->stabilized.render_flag != render_flag || cache->stabilized.proxy != proxy)
return NULL;
@@ -876,13 +876,8 @@
float tloc[2], tscale, tangle;
int clip_framenr = BKE_movieclip_remap_scene_to_clip_frame(clip, framenr);
- if (cache->stabilized.ibuf)
- IMB_freeImBuf(cache->stabilized.ibuf);
-
stableibuf = BKE_tracking_stabilize_frame(&clip->tracking, clip_framenr, ibuf, tloc, &tscale, &tangle);
- cache->stabilized.ibuf = stableibuf;
-
copy_v2_v2(cache->stabilized.loc, tloc);
cache->stabilized.scale = tscale;
@@ -902,6 +897,11 @@
cache->stabilized.postprocess_flag = postprocess_flag;
+ if (cache->stabilized.ibuf)
+ IMB_freeImBuf(cache->stabilized.ibuf);
+
+ cache->stabilized.ibuf = stableibuf;
+
IMB_refImBuf(stableibuf);
return stableibuf;
@@ -921,7 +921,7 @@
if (clip->tracking.stabilization.flag & TRACKING_2D_STABILIZATION) {
MovieClipCache *cache = clip->cache;
- stableibuf = get_stable_cached_frame(clip, user, framenr, postprocess_flag);
+ stableibuf = get_stable_cached_frame(clip, user, ibuf, framenr, postprocess_flag);
if (!stableibuf)
stableibuf = put_stabilized_frame_to_cache(clip, user, ibuf, framenr, postprocess_flag);
Modified: branches/soc-2011-tomato/source/blender/bmesh/intern/bmesh_queries.c
===================================================================
--- branches/soc-2011-tomato/source/blender/bmesh/intern/bmesh_queries.c 2012-07-09 10:26:01 UTC (rev 48749)
+++ branches/soc-2011-tomato/source/blender/bmesh/intern/bmesh_queries.c 2012-07-09 10:33:09 UTC (rev 48750)
@@ -193,12 +193,11 @@
* Get the first loop of a vert. Uses the same initialization code for the first loop of the
* iterator API
*/
-
BMLoop *BM_vert_find_first_loop(BMVert *v)
{
BMEdge *e;
- if(!v || !v->e)
+ if (!v || !v->e)
return NULL;
e = bmesh_disk_faceedge_find_first(v->e, v);
@@ -208,7 +207,6 @@
/**
* Returns TRUE if the vertex is used in a given face.
*/
-
int BM_vert_in_face(BMFace *f, BMVert *v)
{
BMLoop *l_iter, *l_first;
Modified: branches/soc-2011-tomato/source/blender/collada/EffectExporter.cpp
===================================================================
--- branches/soc-2011-tomato/source/blender/collada/EffectExporter.cpp 2012-07-09 10:26:01 UTC (rev 48749)
+++ branches/soc-2011-tomato/source/blender/collada/EffectExporter.cpp 2012-07-09 10:33:09 UTC (rev 48750)
@@ -173,7 +173,7 @@
{
// create a list of indices to textures of type TEX_IMAGE
std::vector<int> tex_indices;
- if(this->export_settings->include_material_textures)
+ if (this->export_settings->include_material_textures)
createTextureIndices(ma, tex_indices);
openEffect(translate_id(id_name(ma)) + "-effect");
Modified: branches/soc-2011-tomato/source/blender/editors/include/ED_armature.h
===================================================================
--- branches/soc-2011-tomato/source/blender/editors/include/ED_armature.h 2012-07-09 10:26:01 UTC (rev 48749)
+++ branches/soc-2011-tomato/source/blender/editors/include/ED_armature.h 2012-07-09 10:33:09 UTC (rev 48750)
@@ -180,6 +180,3 @@
#endif
#endif /* __ED_ARMATURE_H__ */
-
-
-
Property changes on: branches/soc-2011-tomato/source/blender/editors/interface/interface.c
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/ge_candy/source/blender/editors/interface/interface.c:45070-46163
/branches/ge_harmony/source/blender/editors/interface/interface.c:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list