Merging r42896 through r42944 from trunk into soc-2911-tomato

7 files changed, 66 insertions, 85 deletions

diff --git a/source/blender/editors/mesh/editmesh_lib.c b/source/blender/editors/mesh/editmesh_lib.c
index 5e8105d507a..8dea636f0b6 100644
--- a/source/blender/editors/mesh/editmesh_lib.c
+++ b/source/blender/editors/mesh/editmesh_lib.c
@@ -2412,7 +2412,7 @@ void EM_make_hq_normals(EditMesh *em)
 	EdgeHash *edge_hash = BLI_edgehash_new();
 	EdgeHashIterator *edge_iter;
 	int edge_ref_count = 0;
-	int ed_v1, ed_v2; /* use when getting the key */
+	unsigned int ed_v1, ed_v2; /* use when getting the key */
 	EdgeFaceRef *edge_ref_array = MEM_callocN(em->totedge * sizeof(EdgeFaceRef), "Edge Connectivity");
 	EdgeFaceRef *edge_ref;
 	float edge_normal[3];
@@ -2426,15 +2426,20 @@ void EM_make_hq_normals(EditMesh *em)
 
 	/* This function adds an edge hash if its not there, and adds the face index */
 #define NOCALC_EDGEWEIGHT_ADD_EDGEREF_FACE(EDV1, EDV2); \
-			edge_ref = (EdgeFaceRef *)BLI_edgehash_lookup(edge_hash, EDV1, EDV2); \
+		{ \
+			const unsigned int mf_v1 = EDV1; \
+			const unsigned int mf_v2 = EDV2; \
+			edge_ref = (EdgeFaceRef *)BLI_edgehash_lookup(edge_hash, mf_v1, mf_v2); \
 			if (!edge_ref) { \
 				edge_ref = &edge_ref_array[edge_ref_count]; edge_ref_count++; \
-				edge_ref->f1=i; \
-				edge_ref->f2=-1; \
-				BLI_edgehash_insert(edge_hash, EDV1, EDV2, edge_ref); \
-			} else { \
-				edge_ref->f2=i; \
-			}
+				edge_ref->f1 = i; \
+				edge_ref->f2 = -1; \
+				BLI_edgehash_insert(edge_hash, mf_v1, mf_v2, edge_ref); \
+			} \
+			else { \
+				edge_ref->f2 = i; \
+			} \
+		}
 
 
 	efa= em->faces.first;
@@ -2456,7 +2461,7 @@ void EM_make_hq_normals(EditMesh *em)
 
 	for(edge_iter = BLI_edgehashIterator_new(edge_hash); !BLI_edgehashIterator_isDone(edge_iter); BLI_edgehashIterator_step(edge_iter)) {
 		/* Get the edge vert indices, and edge value (the face indices that use it)*/
-		BLI_edgehashIterator_getKey(edge_iter, (int*)&ed_v1, (int*)&ed_v2);
+		BLI_edgehashIterator_getKey(edge_iter, &ed_v1, &ed_v2);
 		edge_ref = BLI_edgehashIterator_getValue(edge_iter);
 
 		if (edge_ref->f2 != -1) {
diff --git a/source/blender/editors/render/render_internal.c b/source/blender/editors/render/render_internal.c
index 8a580627da3..bff93fea067 100644
--- a/source/blender/editors/render/render_internal.c
+++ b/source/blender/editors/render/render_internal.c
@@ -76,10 +76,10 @@
 /* called inside thread! */
 void image_buffer_rect_update(Scene *scene, RenderResult *rr, ImBuf *ibuf, volatile rcti *renrect)
 {
-	float x1, y1, *rectf= NULL;
+	float *rectf= NULL;
 	int ymin, ymax, xmin, xmax;
-	int rymin, rxmin, do_color_management;
-	char *rectc;
+	int rymin, rxmin, predivide, profile_from;
+	unsigned char *rectc;
 
 	/* if renrect argument, we only refresh scanlines */
 	if(renrect) {
@@ -136,50 +136,17 @@ void image_buffer_rect_update(Scene *scene, RenderResult *rr, ImBuf *ibuf, volat
 		imb_addrectImBuf(ibuf);
 	
 	rectf+= 4*(rr->rectx*ymin + xmin);
-	rectc= (char *)(ibuf->rect + ibuf->x*rymin + rxmin);
+	rectc= (unsigned char*)(ibuf->rect + ibuf->x*rymin + rxmin);
 
-	do_color_management = (scene && (scene->r.color_mgt_flag & R_COLOR_MANAGEMENT));
-	
-	/* XXX make nice consistent functions for this */
-	for(y1= 0; y1<ymax; y1++) {
-		float *rf= rectf;
-		float srgb[3];
-		char *rc= rectc;
-		const float dither = ibuf->dither / 255.0f;
-
-		/* XXX temp. because crop offset */
-		if(rectc >= (char *)(ibuf->rect)) {
-			for(x1= 0; x1<xmax; x1++, rf += 4, rc+=4) {
-				/* color management */
-				if(do_color_management) {
-					srgb[0]= linearrgb_to_srgb(rf[0]);
-					srgb[1]= linearrgb_to_srgb(rf[1]);
-					srgb[2]= linearrgb_to_srgb(rf[2]);
-				}
-				else {
-					copy_v3_v3(srgb, rf);
-				}
-
-				/* dither */
-				if(dither != 0.0f) {
-					const float d = (BLI_frand()-0.5f)*dither;
-
-					srgb[0] += d;
-					srgb[1] += d;
-					srgb[2] += d;
-				}
-
-				/* write */
-				rc[0]= FTOCHAR(srgb[0]);
-				rc[1]= FTOCHAR(srgb[1]);
-				rc[2]= FTOCHAR(srgb[2]);
-				rc[3]= FTOCHAR(rf[3]);
-			}
-		}
+	if(scene && (scene->r.color_mgt_flag & R_COLOR_MANAGEMENT))
+		profile_from= IB_PROFILE_LINEAR_RGB;
+	else
+		profile_from= IB_PROFILE_SRGB;
+	predivide= 0;
 
-		rectf += 4*rr->rectx;
-		rectc += 4*ibuf->x;
-	}
+	IMB_buffer_byte_from_float(rectc, rectf,
+		4, ibuf->dither, IB_PROFILE_SRGB, profile_from, predivide,
+		xmax, ymax, ibuf->x, rr->rectx);
 }
 
 /* ****************************** render invoking ***************** */
diff --git a/source/blender/editors/render/render_opengl.c b/source/blender/editors/render/render_opengl.c
index 35b21c626ed..be4d54ae2e8 100644
--- a/source/blender/editors/render/render_opengl.c
+++ b/source/blender/editors/render/render_opengl.c
@@ -206,14 +206,11 @@ static void screen_opengl_render_apply(OGLRender *oglrender)
 	 * float buffer. */
 
 	if(oglrender->scene->r.color_mgt_flag & R_COLOR_MANAGEMENT) {
-		float *rctf = rr->rectf;
-		int i;
+		int predivide= 0; /* no alpha */
 
-		for (i = oglrender->sizex * oglrender->sizey; i > 0; i--, rctf+=4) {
-			rctf[0]= srgb_to_linearrgb(rctf[0]);
-			rctf[1]= srgb_to_linearrgb(rctf[1]);
-			rctf[2]= srgb_to_linearrgb(rctf[2]);
-		}
+		IMB_buffer_float_from_float(rr->rectf, rr->rectf,
+			4, IB_PROFILE_LINEAR_RGB, IB_PROFILE_SRGB, predivide,
+			oglrender->sizex, oglrender->sizey, oglrender->sizex, oglrender->sizex);
 	}
 
 	RE_ReleaseResult(oglrender->re);
diff --git a/source/blender/editors/screen/glutil.c b/source/blender/editors/screen/glutil.c
index 0bba9838005..8f04940efd6 100644
--- a/source/blender/editors/screen/glutil.c
+++ b/source/blender/editors/screen/glutil.c
@@ -45,6 +45,9 @@
 #include "BIF_gl.h"
 #include "BIF_glutil.h"
 
+#include "IMB_imbuf.h"
+#include "IMB_imbuf_types.h"
+
 #ifndef GL_CLAMP_TO_EDGE
 #define GL_CLAMP_TO_EDGE                        0x812F
 #endif
@@ -563,17 +566,17 @@ void glaDrawPixelsTex(float x, float y, int img_w, int img_h, int format, void *
 void glaDrawPixelsSafe_to32(float fx, float fy, int img_w, int img_h, int UNUSED(row_w), float *rectf, int do_gamma_correct)
 {
 	unsigned char *rect32;
+	int profile_from= (do_gamma_correct)? IB_PROFILE_LINEAR_RGB: IB_PROFILE_SRGB;
+	int predivide= 0;
 	
 	/* copy imgw-imgh to a temporal 32 bits rect */
 	if(img_w<1 || img_h<1) return;
 	
 	rect32= MEM_mallocN(img_w*img_h*sizeof(int), "temp 32 bits");
 	
-	if (do_gamma_correct) {
-		floatbuf_to_srgb_byte(rectf, rect32, 0, img_w, 0, img_h, img_w);
-	} else {
-		floatbuf_to_byte(rectf, rect32, 0, img_w, 0, img_h, img_w);
-	 }
+	IMB_buffer_byte_from_float(rect32, rectf,
+		4, 0, IB_PROFILE_SRGB, profile_from, predivide, 
+		img_w, img_h, img_w, img_w);
 	
 	glaDrawPixelsSafe(fx, fy, img_w, img_h, img_w, GL_RGBA, GL_UNSIGNED_BYTE, rect32);
 
diff --git a/source/blender/editors/space_clip/clip_ops.c b/source/blender/editors/space_clip/clip_ops.c
index 34726732a17..fe0b58ddda9 100644
--- a/source/blender/editors/space_clip/clip_ops.c
+++ b/source/blender/editors/space_clip/clip_ops.c
@@ -827,6 +827,7 @@ typedef struct ProxyBuildJob {
 	Scene *scene;
 	struct Main *main;
 	MovieClip *clip;
+	int clip_flag;
 } ProxyJob;
 
 static void proxy_freejob(void *pjv)
@@ -877,10 +878,10 @@ static void proxy_startjob(void *pjv, short *stop, short *do_update, float *prog
 
 	for(cfra= sfra; cfra<=efra; cfra++) {
 		if(clip->source != MCLIP_SRC_MOVIE)
-			BKE_movieclip_build_proxy_frame(clip, NULL, cfra, build_sizes, build_count, 0);
+			BKE_movieclip_build_proxy_frame(clip, pj->clip_flag, NULL, cfra, build_sizes, build_count, 0);
 
 		if(undistort)
-			BKE_movieclip_build_proxy_frame(clip, distortion, cfra, build_sizes, build_count, 1);
+			BKE_movieclip_build_proxy_frame(clip, pj->clip_flag, distortion, cfra, build_sizes, build_count, 1);
 
 		if(*stop || G.afbreek)
 			break;
@@ -911,6 +912,7 @@ static int clip_rebuild_proxy_exec(bContext *C, wmOperator *UNUSED(op))
 	pj->scene= scene;
 	pj->main= CTX_data_main(C);
 	pj->clip= clip;
+	pj->clip_flag= clip->flag&MCLIP_TIMECODE_FLAGS;
 
 	WM_jobs_customdata(steve, pj, proxy_freejob);
 	WM_jobs_timer(steve, 0.2, NC_MOVIECLIP|ND_DISPLAY, 0);
diff --git a/source/blender/editors/space_clip/tracking_ops.c b/source/blender/editors/space_clip/tracking_ops.c
index dd5b78c5b8d..918fc5f347d 100644
--- a/source/blender/editors/space_clip/tracking_ops.c
+++ b/source/blender/editors/space_clip/tracking_ops.c
@@ -2738,7 +2738,8 @@ static int detect_features_exec(bContext *C, wmOperator *op)
 {
 	SpaceClip *sc= CTX_wm_space_clip(C);
 	MovieClip *clip= ED_space_clip(sc);
-	ImBuf *ibuf= BKE_movieclip_get_ibuf_flag(clip, &sc->user, 0);
+	int clip_flag= clip->flag&MCLIP_TIMECODE_FLAGS;
+	ImBuf *ibuf= BKE_movieclip_get_ibuf_flag(clip, &sc->user, clip_flag);
 	MovieTracking *tracking= &clip->tracking;
 	ListBase *tracksbase= BKE_tracking_get_tracks(tracking);
 	MovieTrackingTrack *track= tracksbase->first;
diff --git a/source/blender/editors/space_view3d/drawobject.c b/source/blender/editors/space_view3d/drawobject.c
index 79c08c8dea9..7f54821c98d 100644
--- a/source/blender/editors/space_view3d/drawobject.c
+++ b/source/blender/editors/space_view3d/drawobject.c
@@ -2811,28 +2811,34 @@ static void draw_em_indices(EditMesh *em)
 
 	/* For now, reuse appropriate theme colors from stats text colors */
 
-	UI_GetThemeColor3ubv(TH_DRAWEXTRA_FACEANG, col);
-	for (v = em->verts.first, i = 0; v; v = v->next, i++) {
-		if (v->f & SELECT) {
-			sprintf(val, "%d", i);
-			view3d_cached_text_draw_add(v->co, val, 0, V3D_CACHE_TEXT_ASCII, col);
+	if (em->selectmode & SCE_SELECT_VERTEX) {
+		UI_GetThemeColor3ubv(TH_DRAWEXTRA_FACEANG, col);
+		for (v = em->verts.first, i = 0; v; v = v->next, i++) {
+			if (v->f & SELECT) {
+				sprintf(val, "%d", i);
+				view3d_cached_text_draw_add(v->co, val, 0, V3D_CACHE_TEXT_ASCII, col);
+			}
 		}
 	}
 
-	UI_GetThemeColor3ubv(TH_DRAWEXTRA_EDGELEN, col);
-	for (e = em->edges.first, i = 0; e; e = e->next, i++) {
-		if (e->f & SELECT) {
-			sprintf(val, "%d", i);
-			mid_v3_v3v3(pos, e->v1->co, e->v2->co);
-			view3d_cached_text_draw_add(pos, val, 0, V3D_CACHE_TEXT_ASCII, col);
+	if (em->selectmode & SCE_SELECT_EDGE) {
+		UI_GetThemeColor3ubv(TH_DRAWEXTRA_EDGELEN, col);
+		for (e = em->edges.first, i = 0; e; e = e->next, i++) {
+			if (e->f & SELECT) {
+				sprintf(val, "%d", i);
+				mid_v3_v3v3(pos, e->v1->co, e->v2->co);
+				view3d_cached_text_draw_add(pos, val, 0, V3D_CACHE_TEXT_ASCII, col);
+			}
 		}
 	}
 
-	UI_GetThemeColor3ubv(TH_DRAWEXTRA_FACEAREA, col);
-	for (f = em->faces.first, i = 0; f; f = f->next, i++) {
-		if (f->f & SELECT) {
-			sprintf(val, "%d", i);
-			view3d_cached_text_draw_add(f->cent, val, 0, V3D_CACHE_TEXT_ASCII, col);
+	if (em->selectmode & SCE_SELECT_FACE) {
+		UI_GetThemeColor3ubv(TH_DRAWEXTRA_FACEAREA, col);
+		for (f = em->faces.first, i = 0; f; f = f->next, i++) {
+			if (f->f & SELECT) {
+				sprintf(val, "%d", i);
+				view3d_cached_text_draw_add(f->cent, val, 0, V3D_CACHE_TEXT_ASCII, col);
+			}
 		}
 	}
 }