[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [50097] branches/soc-2012-swiss_cheese: svn merge ^/trunk/blender -r50064:50096
Campbell Barton
ideasman42 at gmail.com
Tue Aug 21 20:20:02 CEST 2012
Revision: 50097
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=50097
Author: campbellbarton
Date: 2012-08-21 18:20:02 +0000 (Tue, 21 Aug 2012)
Log Message:
-----------
svn merge ^/trunk/blender -r50064:50096
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=50064
Modified Paths:
--------------
branches/soc-2012-swiss_cheese/intern/guardedalloc/MEM_guardedalloc.h
branches/soc-2012-swiss_cheese/intern/guardedalloc/intern/mallocn.c
branches/soc-2012-swiss_cheese/source/blender/blenfont/intern/blf_dir.c
branches/soc-2012-swiss_cheese/source/blender/blenfont/intern/blf_font.c
branches/soc-2012-swiss_cheese/source/blender/blenfont/intern/blf_glyph.c
branches/soc-2012-swiss_cheese/source/blender/blenkernel/BKE_colortools.h
branches/soc-2012-swiss_cheese/source/blender/blenkernel/BKE_font.h
branches/soc-2012-swiss_cheese/source/blender/blenkernel/BKE_mask.h
branches/soc-2012-swiss_cheese/source/blender/blenkernel/BKE_packedFile.h
branches/soc-2012-swiss_cheese/source/blender/blenkernel/BKE_sequencer.h
branches/soc-2012-swiss_cheese/source/blender/blenkernel/intern/brush.c
branches/soc-2012-swiss_cheese/source/blender/blenkernel/intern/colortools.c
branches/soc-2012-swiss_cheese/source/blender/blenkernel/intern/font.c
branches/soc-2012-swiss_cheese/source/blender/blenkernel/intern/image.c
branches/soc-2012-swiss_cheese/source/blender/blenkernel/intern/mask.c
branches/soc-2012-swiss_cheese/source/blender/blenkernel/intern/packedFile.c
branches/soc-2012-swiss_cheese/source/blender/blenkernel/intern/seqcache.c
branches/soc-2012-swiss_cheese/source/blender/blenkernel/intern/texture.c
branches/soc-2012-swiss_cheese/source/blender/blenkernel/intern/world.c
branches/soc-2012-swiss_cheese/source/blender/blenlib/BLI_vfontdata.h
branches/soc-2012-swiss_cheese/source/blender/blenlib/intern/freetypefont.c
branches/soc-2012-swiss_cheese/source/blender/blenloader/intern/readfile.c
branches/soc-2012-swiss_cheese/source/blender/blenloader/intern/versioning_250.c
branches/soc-2012-swiss_cheese/source/blender/bmesh/operators/bmo_extrude.c
branches/soc-2012-swiss_cheese/source/blender/compositor/nodes/COM_TimeNode.cpp
branches/soc-2012-swiss_cheese/source/blender/compositor/operations/COM_ColorBalanceASCCDLOperation.cpp
branches/soc-2012-swiss_cheese/source/blender/compositor/operations/COM_ColorCurveOperation.cpp
branches/soc-2012-swiss_cheese/source/blender/compositor/operations/COM_ColorCurveOperation.h
branches/soc-2012-swiss_cheese/source/blender/compositor/operations/COM_CurveBaseOperation.cpp
branches/soc-2012-swiss_cheese/source/blender/compositor/operations/COM_CurveBaseOperation.h
branches/soc-2012-swiss_cheese/source/blender/compositor/operations/COM_GlareGhostOperation.cpp
branches/soc-2012-swiss_cheese/source/blender/compositor/operations/COM_HueSaturationValueCorrectOperation.cpp
branches/soc-2012-swiss_cheese/source/blender/compositor/operations/COM_VectorCurveOperation.cpp
branches/soc-2012-swiss_cheese/source/blender/editors/interface/interface_draw.c
branches/soc-2012-swiss_cheese/source/blender/editors/interface/interface_handlers.c
branches/soc-2012-swiss_cheese/source/blender/editors/interface/interface_templates.c
branches/soc-2012-swiss_cheese/source/blender/editors/mask/mask_draw.c
branches/soc-2012-swiss_cheese/source/blender/editors/mesh/editmesh_tools.c
branches/soc-2012-swiss_cheese/source/blender/editors/object/object_vgroup.c
branches/soc-2012-swiss_cheese/source/blender/editors/space_image/image_buttons.c
branches/soc-2012-swiss_cheese/source/blender/editors/transform/transform_generics.c
branches/soc-2012-swiss_cheese/source/blender/gpu/intern/gpu_material.c
branches/soc-2012-swiss_cheese/source/blender/makesdna/DNA_color_types.h
branches/soc-2012-swiss_cheese/source/blender/makesdna/DNA_vfont_types.h
branches/soc-2012-swiss_cheese/source/blender/makesrna/intern/rna_color.c
branches/soc-2012-swiss_cheese/source/blender/modifiers/intern/MOD_warp.c
branches/soc-2012-swiss_cheese/source/blender/modifiers/intern/MOD_weightvg_util.c
branches/soc-2012-swiss_cheese/source/blender/nodes/composite/node_composite_tree.c
branches/soc-2012-swiss_cheese/source/blender/nodes/composite/node_composite_util.c
branches/soc-2012-swiss_cheese/source/blender/nodes/composite/node_composite_util.h
branches/soc-2012-swiss_cheese/source/blender/nodes/composite/nodes/node_composite_alphaOver.c
branches/soc-2012-swiss_cheese/source/blender/nodes/composite/nodes/node_composite_bilateralblur.c
branches/soc-2012-swiss_cheese/source/blender/nodes/composite/nodes/node_composite_blur.c
branches/soc-2012-swiss_cheese/source/blender/nodes/composite/nodes/node_composite_brightness.c
branches/soc-2012-swiss_cheese/source/blender/nodes/composite/nodes/node_composite_colorSpill.c
branches/soc-2012-swiss_cheese/source/blender/nodes/composite/nodes/node_composite_common.c
branches/soc-2012-swiss_cheese/source/blender/nodes/composite/nodes/node_composite_composite.c
branches/soc-2012-swiss_cheese/source/blender/nodes/composite/nodes/node_composite_curves.c
branches/soc-2012-swiss_cheese/source/blender/nodes/composite/nodes/node_composite_huecorrect.c
branches/soc-2012-swiss_cheese/source/blender/nodes/composite/nodes/node_composite_keying.c
branches/soc-2012-swiss_cheese/source/blender/nodes/composite/nodes/node_composite_keyingscreen.c
branches/soc-2012-swiss_cheese/source/blender/nodes/composite/nodes/node_composite_mask.c
branches/soc-2012-swiss_cheese/source/blender/nodes/composite/nodes/node_composite_moviedistortion.c
branches/soc-2012-swiss_cheese/source/blender/nodes/composite/nodes/node_composite_outputFile.c
branches/soc-2012-swiss_cheese/source/blender/nodes/composite/nodes/node_composite_splitViewer.c
branches/soc-2012-swiss_cheese/source/blender/nodes/composite/nodes/node_composite_viewer.c
branches/soc-2012-swiss_cheese/source/blender/nodes/shader/nodes/node_shader_curves.c
branches/soc-2012-swiss_cheese/source/blender/nodes/texture/nodes/node_texture_curves.c
branches/soc-2012-swiss_cheese/source/blender/render/intern/source/convertblender.c
branches/soc-2012-swiss_cheese/source/blender/render/intern/source/pointdensity.c
branches/soc-2012-swiss_cheese/source/blender/render/intern/source/shadeoutput.c
branches/soc-2012-swiss_cheese/source/blender/windowmanager/intern/wm_files.c
branches/soc-2012-swiss_cheese/source/blender/windowmanager/intern/wm_init_exit.c
branches/soc-2012-swiss_cheese/source/blender/windowmanager/intern/wm_playanim.c
Property Changed:
----------------
branches/soc-2012-swiss_cheese/
branches/soc-2012-swiss_cheese/source/blender/editors/interface/interface.c
branches/soc-2012-swiss_cheese/source/blender/editors/space_outliner/
Property changes on: branches/soc-2012-swiss_cheese
___________________________________________________________________
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
/trunk/blender:46806-48425,48428-50064
+ /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
/trunk/blender:46806-48425,48428-50096
Modified: branches/soc-2012-swiss_cheese/intern/guardedalloc/MEM_guardedalloc.h
===================================================================
--- branches/soc-2012-swiss_cheese/intern/guardedalloc/MEM_guardedalloc.h 2012-08-21 18:15:40 UTC (rev 50096)
+++ branches/soc-2012-swiss_cheese/intern/guardedalloc/MEM_guardedalloc.h 2012-08-21 18:20:02 UTC (rev 50097)
@@ -92,7 +92,7 @@
/**
* Duplicates a block of memory, and returns a pointer to the
* newly allocated block. */
- void *MEM_dupallocN(void *vmemh)
+ void *MEM_dupallocN(const void *vmemh)
#if MEM_GNU_ATTRIBUTES
__attribute__((warn_unused_result))
#endif
Modified: branches/soc-2012-swiss_cheese/intern/guardedalloc/intern/mallocn.c
===================================================================
--- branches/soc-2012-swiss_cheese/intern/guardedalloc/intern/mallocn.c 2012-08-21 18:15:40 UTC (rev 50096)
+++ branches/soc-2012-swiss_cheese/intern/guardedalloc/intern/mallocn.c 2012-08-21 18:20:02 UTC (rev 50097)
@@ -248,12 +248,12 @@
}
}
-void *MEM_dupallocN(void *vmemh)
+void *MEM_dupallocN(const void *vmemh)
{
void *newp = NULL;
if (vmemh) {
- MemHead *memh = vmemh;
+ const MemHead *memh = vmemh;
memh--;
#ifndef DEBUG_MEMDUPLINAME
Modified: branches/soc-2012-swiss_cheese/source/blender/blenfont/intern/blf_dir.c
===================================================================
--- branches/soc-2012-swiss_cheese/source/blender/blenfont/intern/blf_dir.c 2012-08-21 18:15:40 UTC (rev 50096)
+++ branches/soc-2012-swiss_cheese/source/blender/blenfont/intern/blf_dir.c 2012-08-21 18:20:02 UTC (rev 50097)
@@ -43,7 +43,10 @@
#include "BKE_utildefines.h"
-#include "BLI_blenlib.h"
+#include "BLI_fileops.h"
+#include "BLI_listbase.h"
+#include "BLI_path_util.h"
+#include "BLI_string.h"
#include "BLF_api.h"
#include "blf_internal_types.h"
Modified: branches/soc-2012-swiss_cheese/source/blender/blenfont/intern/blf_font.c
===================================================================
--- branches/soc-2012-swiss_cheese/source/blender/blenfont/intern/blf_font.c 2012-08-21 18:15:40 UTC (rev 50096)
+++ branches/soc-2012-swiss_cheese/source/blender/blenfont/intern/blf_font.c 2012-08-21 18:20:02 UTC (rev 50097)
@@ -43,10 +43,12 @@
#include "DNA_vec_types.h"
-
-#include "BLI_blenlib.h"
+#include "BLI_listbase.h"
+#include "BLI_math.h"
+#include "BLI_rect.h"
+#include "BLI_string.h"
+#include "BLI_string_utf8.h"
#include "BLI_linklist.h" /* linknode */
-#include "BLI_math.h"
#include "BLF_api.h"
@@ -153,7 +155,7 @@
_kern_mode, \
&(_delta)) == 0) \
{ \
- _pen_x += delta.x >> 6; \
+ _pen_x += _delta.x >> 6; \
} \
} \
} (void)0
@@ -242,9 +244,9 @@
FontBufInfoBLF *buf_info = &font->buf_info;
float b_col_float[4];
const unsigned char b_col_char[4] = {buf_info->col[0] * 255,
- buf_info->col[1] * 255,
- buf_info->col[2] * 255,
- buf_info->col[3] * 255};
+ buf_info->col[1] * 255,
+ buf_info->col[2] * 255,
+ buf_info->col[3] * 255};
unsigned char *cbuf;
int chx, chy;
@@ -255,7 +257,7 @@
blf_font_ensure_ascii_table(font);
- /* another buffer spesific call for color conversion */
+ /* another buffer specific call for color conversion */
if (buf_info->do_color_management) {
srgb_to_linearrgb_v4(b_col_float, buf_info->col);
}
Modified: branches/soc-2012-swiss_cheese/source/blender/blenfont/intern/blf_glyph.c
===================================================================
--- branches/soc-2012-swiss_cheese/source/blender/blenfont/intern/blf_glyph.c 2012-08-21 18:15:40 UTC (rev 50096)
+++ branches/soc-2012-swiss_cheese/source/blender/blenfont/intern/blf_glyph.c 2012-08-21 18:20:02 UTC (rev 50097)
@@ -46,7 +46,8 @@
#include "DNA_vec_types.h"
#include "DNA_userdef_types.h"
-#include "BLI_blenlib.h"
+#include "BLI_listbase.h"
+#include "BLI_rect.h"
#include "BLF_api.h"
Modified: branches/soc-2012-swiss_cheese/source/blender/blenkernel/BKE_colortools.h
===================================================================
--- branches/soc-2012-swiss_cheese/source/blender/blenkernel/BKE_colortools.h 2012-08-21 18:15:40 UTC (rev 50096)
+++ branches/soc-2012-swiss_cheese/source/blender/blenkernel/BKE_colortools.h 2012-08-21 18:20:02 UTC (rev 50097)
@@ -53,12 +53,13 @@
void curvemapping_free(struct CurveMapping *cumap);
void curvemapping_copy_data(struct CurveMapping *target, struct CurveMapping *cumap);
struct CurveMapping *curvemapping_copy(struct CurveMapping *cumap);
+void curvemapping_set_black_white_ex(const float black[3], const float white[3], float r_bwmul[3]);
void curvemapping_set_black_white(struct CurveMapping *cumap, const float black[3], const float white[3]);
#define CURVEMAP_SLOPE_NEGATIVE 0
#define CURVEMAP_SLOPE_POSITIVE 1
void curvemap_reset(struct CurveMap *cuma, struct rctf *clipr, int preset, int slope);
-void curvemap_remove(struct CurveMap *cuma, int flag);
+void curvemap_remove(struct CurveMap *cuma, const short flag);
void curvemap_remove_point(struct CurveMap *cuma, struct CurveMapPoint *cmp);
struct CurveMapPoint *curvemap_insert(struct CurveMap *cuma, float x, float y);
void curvemap_sethandle(struct CurveMap *cuma, int type);
@@ -66,23 +67,31 @@
void curvemapping_changed(struct CurveMapping *cumap, int rem_doubles);
void curvemapping_changed_all(struct CurveMapping *cumap);
+/* call before _all_ evaluation functions */
+void curvemapping_initialize(struct CurveMapping *cumap);
+
+/* keep these (const CurveMap) - to help with thread safety */
/* single curve, no table check */
-float curvemap_evaluateF(struct CurveMap *cuma, float value);
+float curvemap_evaluateF(const struct CurveMap *cuma, float value);
/* single curve, with table check */
-float curvemapping_evaluateF(struct CurveMapping *cumap, int cur, float value);
-void curvemapping_evaluate3F(struct CurveMapping *cumap, float vecout[3], const float vecin[3]);
-void curvemapping_evaluateRGBF(struct CurveMapping *cumap, float vecout[3], const float vecin[3]);
-void curvemapping_evaluate_premulRGB(struct CurveMapping *cumap, unsigned char vecout_byte[3], const unsigned char vecin_byte[3]);
-void curvemapping_evaluate_premulRGBF(struct CurveMapping *cumap, float vecout[3], const float vecin[3]);
+float curvemapping_evaluateF(const struct CurveMapping *cumap, int cur, float value);
+void curvemapping_evaluate3F(const struct CurveMapping *cumap, float vecout[3], const float vecin[3]);
+void curvemapping_evaluateRGBF(const struct CurveMapping *cumap, float vecout[3], const float vecin[3]);
+void curvemapping_evaluate_premulRGB(const struct CurveMapping *cumap, unsigned char vecout_byte[3], const unsigned char vecin_byte[3]);
+void curvemapping_evaluate_premulRGBF_ex(const struct CurveMapping *cumap, float vecout[3], const float vecin[3],
+ const float black[3], const float bwmul[3]);
+void curvemapping_evaluate_premulRGBF(const struct CurveMapping *cumap, float vecout[3], const float vecin[3]);
+int curvemapping_RGBA_does_something(const struct CurveMapping *cumap);
+void curvemapping_table_RGBA(const struct CurveMapping *cumap, float **array, int *size);
+
+/* non-const, these modify the curve */
void curvemapping_do_ibuf(struct CurveMapping *cumap, struct ImBuf *ibuf);
void curvemapping_premultiply(struct CurveMapping *cumap, int restore);
-int curvemapping_RGBA_does_something(struct CurveMapping *cumap);
-void curvemapping_initialize(struct CurveMapping *cumap);
-void curvemapping_table_RGBA(struct CurveMapping *cumap, float **array, int *size);
+
+
void BKE_histogram_update_sample_line(struct Histogram *hist, struct ImBuf *ibuf, const short use_color_management);
void scopes_update(struct Scopes *scopes, struct ImBuf *ibuf, int use_color_management);
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list