Revision: 50081
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=50081
Author: campbellbarton
Date: 2012-08-21 11:11:43 +0000 (Tue, 21 Aug 2012)
Log Message:
-----------
svn merge ^/trunk/blender -r50076:50080
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=50076
Modified Paths:
--------------
branches/soc-2011-tomato/source/blender/blenkernel/BKE_packedFile.h
branches/soc-2011-tomato/source/blender/blenkernel/intern/font.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/image.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/packedFile.c
branches/soc-2011-tomato/source/blender/compositor/operations/COM_GlareGhostOperation.cpp
branches/soc-2011-tomato/source/blender/editors/space_image/image_buttons.c
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-50076
+
/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-50080
Modified: branches/soc-2011-tomato/source/blender/blenkernel/BKE_packedFile.h
===================================================================
--- branches/soc-2011-tomato/source/blender/blenkernel/BKE_packedFile.h
2012-08-21 11:10:16 UTC (rev 50080)
+++ branches/soc-2011-tomato/source/blender/blenkernel/BKE_packedFile.h
2012-08-21 11:11:43 UTC (rev 50081)
@@ -43,7 +43,7 @@
struct VFont;
/* pack */
-struct PackedFile *dupPackedFileMemory(const struct PackedFile *pf_src);
+struct PackedFile *dupPackedFile(const struct PackedFile *pf_src);
struct PackedFile *newPackedFile(struct ReportList *reports, const char
*filename, const char *relabase);
struct PackedFile *newPackedFileMemory(void *mem, int memlen);
Modified: branches/soc-2011-tomato/source/blender/blenkernel/intern/font.c
===================================================================
--- branches/soc-2011-tomato/source/blender/blenkernel/intern/font.c
2012-08-21 11:10:16 UTC (rev 50080)
+++ branches/soc-2011-tomato/source/blender/blenkernel/intern/font.c
2012-08-21 11:11:43 UTC (rev 50081)
@@ -60,7 +60,6 @@
#include "BKE_curve.h"
#include "BKE_displist.h"
-//static ListBase ttfdata = {NULL, NULL};
/* The vfont code */
void BKE_vfont_free_data(struct VFont *vfont)
@@ -149,7 +148,7 @@
/* We need to copy a tmp font to memory unless
it is already there */
if (vfont->temp_pf == NULL) {
- vfont->temp_pf =
dupPackedFileMemory(pf);
+ vfont->temp_pf = dupPackedFile(pf);
}
}
else {
@@ -237,8 +236,6 @@
if (!vfont || vfont->packedfile != pf) {
freePackedFile(pf);
}
-
- //XXX waitcursor(0);
}
return vfont;
@@ -248,13 +245,13 @@
{
switch (info->flag & (CU_CHINFO_BOLD | CU_CHINFO_ITALIC)) {
case CU_CHINFO_BOLD:
- if (cu->vfontb) return(cu->vfontb); else
return(cu->vfont);
+ return cu->vfontb ? cu->vfontb : cu->vfont;
case CU_CHINFO_ITALIC:
- if (cu->vfonti) return(cu->vfonti); else
return(cu->vfont);
+ return cu->vfonti ? cu->vfonti : cu->vfont;
case (CU_CHINFO_BOLD | CU_CHINFO_ITALIC):
- if (cu->vfontbi) return(cu->vfontbi); else
return(cu->vfont);
+ return cu->vfontbi ? cu->vfontbi : cu->vfont;
default:
- return(cu->vfont);
+ return cu->vfont;
}
}
Modified: branches/soc-2011-tomato/source/blender/blenkernel/intern/image.c
===================================================================
--- branches/soc-2011-tomato/source/blender/blenkernel/intern/image.c
2012-08-21 11:10:16 UTC (rev 50080)
+++ branches/soc-2011-tomato/source/blender/blenkernel/intern/image.c
2012-08-21 11:11:43 UTC (rev 50081)
@@ -2165,7 +2165,9 @@
void BKE_image_release_renderresult(Scene *scene, Image *ima)
{
- if (ima->rr) ;
+ if (ima->rr) {
+ /* pass */
+ }
else if (ima->type == IMA_TYPE_R_RESULT) {
if (ima->render_slot == ima->last_render_slot)
RE_ReleaseResult(RE_GetRender(scene->id.name));
Modified: branches/soc-2011-tomato/source/blender/blenkernel/intern/packedFile.c
===================================================================
--- branches/soc-2011-tomato/source/blender/blenkernel/intern/packedFile.c
2012-08-21 11:10:16 UTC (rev 50080)
+++ branches/soc-2011-tomato/source/blender/blenkernel/intern/packedFile.c
2012-08-21 11:11:43 UTC (rev 50081)
@@ -159,7 +159,7 @@
printf("freePackedFile: Trying to free a NULL pointer\n");
}
-PackedFile *dupPackedFileMemory(const PackedFile *pf_src)
+PackedFile *dupPackedFile(const PackedFile *pf_src)
{
PackedFile *pf_dst;
Modified:
branches/soc-2011-tomato/source/blender/compositor/operations/COM_GlareGhostOperation.cpp
===================================================================
---
branches/soc-2011-tomato/source/blender/compositor/operations/COM_GlareGhostOperation.cpp
2012-08-21 11:10:16 UTC (rev 50080)
+++
branches/soc-2011-tomato/source/blender/compositor/operations/COM_GlareGhostOperation.cpp
2012-08-21 11:11:43 UTC (rev 50081)
@@ -83,11 +83,11 @@
for (x = 0; x < gbuf->getWidth(); x++) {
u = (float)(x + 0.5f) / (float)gbuf->getWidth();
s = (u - 0.5f) * sc + 0.5f, t = (v - 0.5f) * sc + 0.5f;
- tbuf1->read(c, s * gbuf->getWidth(), t *
gbuf->getHeight());
+ tbuf1->readCubic(c, s * gbuf->getWidth(), t *
gbuf->getHeight());
sm = smoothMask(s, t);
mul_v3_fl(c, sm);
s = (u - 0.5f) * isc + 0.5f, t = (v - 0.5f) * isc +
0.5f;
- tbuf2->read(tc, s * gbuf->getWidth() - 0.5f, t *
gbuf->getHeight() - 0.5f);
+ tbuf2->readCubic(tc, s * gbuf->getWidth() - 0.5f, t *
gbuf->getHeight() - 0.5f);
sm = smoothMask(s, t);
madd_v3_v3fl(c, tc, sm);
@@ -108,7 +108,7 @@
np = (n << 2) + p;
s = (u - 0.5f) * scalef[np] + 0.5f;
t = (v - 0.5f) * scalef[np] + 0.5f;
- gbuf->read(c, s * gbuf->getWidth() -
0.5f, t * gbuf->getHeight() - 0.5f);
+ gbuf->readCubic(c, s * gbuf->getWidth()
- 0.5f, t * gbuf->getHeight() - 0.5f);
mul_v3_v3(c, cm[np]);
sm = smoothMask(s, t) * 0.25f;
madd_v3_v3fl(tc, c, sm);
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
/branches/soc-2011-cucumber/source/blender/editors/interface/interface.c:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/vgroup_modifiers/source/blender/editors/interface/interface.c:38694-39989
/trunk/blender/source/blender/editors/interface/interface.c:36831-50076
+ /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
/branches/soc-2011-cucumber/source/blender/editors/interface/interface.c:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/vgroup_modifiers/source/blender/editors/interface/interface.c:38694-39989
/trunk/blender/source/blender/editors/interface/interface.c:36831-50080
Modified:
branches/soc-2011-tomato/source/blender/editors/space_image/image_buttons.c
===================================================================
--- branches/soc-2011-tomato/source/blender/editors/space_image/image_buttons.c
2012-08-21 11:10:16 UTC (rev 50080)
+++ branches/soc-2011-tomato/source/blender/editors/space_image/image_buttons.c
2012-08-21 11:11:43 UTC (rev 50081)
@@ -682,10 +682,12 @@
}
else if (ima->type == IMA_TYPE_R_RESULT) {
/* browse layer/passes */
- Render *re = RE_GetRender(scene->id.name);
- RenderResult *rr = RE_AcquireResultRead(re);
+ RenderResult *rr;
+
+ /* use BKE_image_acquire_renderresult so we
get the correct slot in the menu */
+ rr = BKE_image_acquire_renderresult(scene, ima);
uiblock_layer_pass_arrow_buttons(layout, rr,
iuser, &ima->render_slot);
- RE_ReleaseResult(re);
+ BKE_image_release_renderresult(scene, ima);
}
}
else {
@@ -890,16 +892,16 @@
void uiTemplateImageLayers(uiLayout *layout, bContext *C, Image *ima,
ImageUser *iuser)
{
Scene *scene = CTX_data_scene(C);
- Render *re;
- RenderResult *rr;
/* render layers and passes */
if (ima && iuser) {
const float dpi_fac = UI_DPI_FAC;
- re = RE_GetRender(scene->id.name);
- rr = RE_AcquireResultRead(re);
+ RenderResult *rr;
+
+ /* use BKE_image_acquire_renderresult so we get the correct
slot in the menu */
+ rr = BKE_image_acquire_renderresult(scene, ima);
uiblock_layer_pass_buttons(layout, rr, iuser, 160 * dpi_fac,
(ima->type == IMA_TYPE_R_RESULT) ? &ima->render_slot : NULL);
- RE_ReleaseResult(re);
+ BKE_image_release_renderresult(scene, ima);
}
}
Property changes on:
branches/soc-2011-tomato/source/blender/editors/space_outliner
___________________________________________________________________
Modified: svn:mergeinfo
-
/branches/soc-2011-cucumber/source/blender/editors/space_outliner:38968,38970,38973,39045,40845
/branches/soc-2011-pepper/source/blender/editors/space_outliner:36831-38987
/trunk/blender/source/blender/editors/space_outliner:36831-50076
+
/branches/soc-2011-cucumber/source/blender/editors/space_outliner:38968,38970,38973,39045,40845
/branches/soc-2011-pepper/source/blender/editors/space_outliner:36831-38987
/trunk/blender/source/blender/editors/space_outliner:36831-50080
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
