[Bf-blender-cvs] [f6416b9] soc-2013-viewport_fx: more merge conflict resolution from 9822428f6c2e4e279241f856886d7df5fa2cd144

Jason Wilkins noreply at git.blender.org
Mon Mar 17 17:49:01 CET 2014


Commit: f6416b94a538bbcb834a9b153d1304938bc224a0
Author: Jason Wilkins
Date:   Mon Mar 17 11:48:21 2014 -0500
https://developer.blender.org/rBf6416b94a538bbcb834a9b153d1304938bc224a0

more merge conflict resolution from 9822428f6c2e4e279241f856886d7df5fa2cd144

===================================================================

M	intern/ghost/intern/GHOST_WindowWin32.h
M	intern/guardedalloc/MEM_guardedalloc.h
M	source/blender/blenfont/BLF_translation.h
M	source/blender/blenfont/intern/blf_glyph.c
M	source/blender/blenkernel/intern/cdderivedmesh.c
M	source/blender/blenkernel/intern/editderivedmesh.c
M	source/blender/blenkernel/intern/pbvh.c
M	source/blender/blenlib/BLI_ghash.h
M	source/blender/blenlib/BLI_math_matrix.h
M	source/blender/editors/armature/armature_utils.c
M	source/blender/editors/curve/editcurve.c
M	source/blender/editors/gpencil/drawgpencil.c
M	source/blender/editors/include/ED_armature.h
M	source/blender/editors/interface/interface_draw.c
M	source/blender/editors/interface/interface_panel.c
M	source/blender/editors/mask/mask_draw.c
M	source/blender/editors/mesh/CMakeLists.txt
M	source/blender/editors/screen/CMakeLists.txt
M	source/blender/editors/space_clip/tracking_ops.c
M	source/blender/editors/space_file/file_intern.h
M	source/blender/editors/space_graph/graph_draw.c
M	source/blender/editors/space_image/CMakeLists.txt
M	source/blender/editors/space_view3d/CMakeLists.txt
M	source/blender/editors/space_view3d/drawanimviz.c
M	source/blender/editors/space_view3d/drawmesh.c
M	source/blender/editors/space_view3d/drawobject.c
M	source/blender/editors/space_view3d/drawvolume.c
M	source/blender/editors/space_view3d/view3d_draw.c
M	source/blender/editors/space_view3d/view3d_edit.c
M	source/blender/editors/space_view3d/view3d_intern.h
M	source/blender/editors/uvedit/uvedit_draw.c
M	source/blender/gpu/GPU_material.h
M	source/blender/gpu/intern/gpu_draw.c

===================================================================

diff --git a/intern/ghost/intern/GHOST_WindowWin32.h b/intern/ghost/intern/GHOST_WindowWin32.h
index e5ec6cb..e6ae5a0 100644
--- a/intern/ghost/intern/GHOST_WindowWin32.h
+++ b/intern/ghost/intern/GHOST_WindowWin32.h
@@ -225,6 +225,8 @@ public:
 	 * \return An integer.
 	 */
 	virtual int getSwapInterval();
+
+	/**
 	 * Invalidates the contents of this window.
 	 */
 	virtual GHOST_TSuccess invalidate();
diff --git a/intern/guardedalloc/MEM_guardedalloc.h b/intern/guardedalloc/MEM_guardedalloc.h
index 4fb6896..627b99f 100644
--- a/intern/guardedalloc/MEM_guardedalloc.h
+++ b/intern/guardedalloc/MEM_guardedalloc.h
@@ -65,6 +65,7 @@
 /* needed for uintptr_t and attributes, exception, dont use BLI anywhere else in MEM_* */
 #include "../../source/blender/blenlib/BLI_sys_types.h"
 #include "../../source/blender/blenlib/BLI_compiler_attrs.h"
+#include "../../source/blender/blenlib/BLI_utildefines.h" /* for __func__ */
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/source/blender/blenfont/BLF_translation.h b/source/blender/blenfont/BLF_translation.h
index c119967..7f64828 100644
--- a/source/blender/blenfont/BLF_translation.h
+++ b/source/blender/blenfont/BLF_translation.h
@@ -33,7 +33,7 @@
 #ifndef __BLF_TRANSLATION_H__
 #define __BLF_TRANSLATION_H__
 
-#include "BLI_utildefines.h"  /* for bool type */
+#include "BLI_sys_types.h"  /* for bool type */
 
 #define TEXT_DOMAIN_NAME "blender"
 
diff --git a/source/blender/blenfont/intern/blf_glyph.c b/source/blender/blenfont/intern/blf_glyph.c
index 55a3777..c2cb7c4 100644
--- a/source/blender/blenfont/intern/blf_glyph.c
+++ b/source/blender/blenfont/intern/blf_glyph.c
@@ -180,9 +180,9 @@ static void blf_glyph_cache_texture(FontBLF *font, GlyphCacheBLF *gc)
 	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
 
 #if defined(WITH_GL_PROFILE_CORE)
-	glTexImage2D(GL_TEXTURE_2D, 0, GL_R8, gc->p2_width, gc->p2_height, 0, GL_RED, GL_UNSIGNED_BYTE, buf);
+	glTexImage2D(GL_TEXTURE_2D, 0, GL_R8, gc->p2_width, gc->p2_height, 0, GL_RED, GL_UNSIGNED_BYTE, NULL);
 #elif defined(WITH_GL_PROFILE_COMPAT) || defined(WITH_GL_PROFILE_ES20)
-	glTexImage2D(GL_TEXTURE_2D, 0, GL_ALPHA, gc->p2_width, gc->p2_height, 0, GL_ALPHA, GL_UNSIGNED_BYTE, buf);
+	glTexImage2D(GL_TEXTURE_2D, 0, GL_ALPHA, gc->p2_width, gc->p2_height, 0, GL_ALPHA, GL_UNSIGNED_BYTE, NULL);
 #endif
 GPU_CHECK_NO_ERROR();
 }
diff --git a/source/blender/blenkernel/intern/cdderivedmesh.c b/source/blender/blenkernel/intern/cdderivedmesh.c
index 18dda66..4f1bb87 100644
--- a/source/blender/blenkernel/intern/cdderivedmesh.c
+++ b/source/blender/blenkernel/intern/cdderivedmesh.c
@@ -1290,7 +1290,7 @@ static void cddm_draw_attrib_vertex(DMVertexAttribs *attribs, MVert *mvert, int
 		if (attribs->orco.gl_texco)
 			gpuTexCoord3fv(orco);
 		else
-			gpuVertexAttrib3fvARB(attribs->orco.gl_index, orco);
+			gpuVertexAttrib3fv(attribs->orco.gl_index, orco);
 	}
 
 	/* uv texture coordinates */
@@ -1308,7 +1308,7 @@ static void cddm_draw_attrib_vertex(DMVertexAttribs *attribs, MVert *mvert, int
 		if (attribs->tface[b].gl_texco)
 			gpuTexCoord2fv(uv);
 		else
-			gpuVertexAttrib2fvARB(attribs->tface[b].gl_index, uv);
+			gpuVertexAttrib2fv(attribs->tface[b].gl_index, uv);
 	}
 
 	/* vertex colors */
diff --git a/source/blender/blenkernel/intern/editderivedmesh.c b/source/blender/blenkernel/intern/editderivedmesh.c
index 4399a03..a533394 100644
--- a/source/blender/blenkernel/intern/editderivedmesh.c
+++ b/source/blender/blenkernel/intern/editderivedmesh.c
@@ -459,7 +459,7 @@ static void emDM_drawMappedFaces(
 		const float (*vertexNos)[3];
 		const float (*polyNos)[3];
 
-		if (skip_normals) {
+		if (!useNormals) {
 			vertexNos = NULL;
 			polyNos = NULL;
 		}
@@ -972,6 +972,7 @@ static void emdm_pass_attrib_vertex_glsl(DMVertexAttribs *attribs, BMLoop *loop,
 		int index = i * 4 + index_in_face;
 		const float *tang = (attribs->tang.array) ? attribs->tang.array[index] : zero;
 		gpuVertexAttrib4fv(attribs->tang.gl_index, tang);
+	}
 }
 
 
diff --git a/source/blender/blenkernel/intern/pbvh.c b/source/blender/blenkernel/intern/pbvh.c
index 94a7002..b0ea11f 100644
--- a/source/blender/blenkernel/intern/pbvh.c
+++ b/source/blender/blenkernel/intern/pbvh.c
@@ -1598,7 +1598,7 @@ void BKE_pbvh_node_draw(PBVHNode *node, void *data_v)
 	gpuColor3f(1, 0, 0);
 #endif
 
-	if ((node->flag & PBVH_FullyHidden) == 0)
+	if ((node->flag & PBVH_FullyHidden) == 0) {
 		GPU_draw_pbvh_buffers(node->draw_buffers,
 		                 data->setMaterial,
 		                 data->wireframe);
diff --git a/source/blender/blenlib/BLI_ghash.h b/source/blender/blenlib/BLI_ghash.h
index e5a9369..2f042b2 100644
--- a/source/blender/blenlib/BLI_ghash.h
+++ b/source/blender/blenlib/BLI_ghash.h
@@ -35,6 +35,7 @@
 
 #include "BLI_sys_types.h" /* for bool */
 #include "BLI_compiler_attrs.h"
+#include "BLI_utildefines.h" /* for BLI_INLINE */
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/source/blender/blenlib/BLI_math_matrix.h b/source/blender/blenlib/BLI_math_matrix.h
index 15ca79f..56486a4 100644
--- a/source/blender/blenlib/BLI_math_matrix.h
+++ b/source/blender/blenlib/BLI_math_matrix.h
@@ -30,6 +30,8 @@
  *  \ingroup bli
  */
 
+#include "BLI_sys_types.h" /* for bool */
+
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/source/blender/editors/armature/armature_utils.c b/source/blender/editors/armature/armature_utils.c
index 52e3285..853d957 100644
--- a/source/blender/editors/armature/armature_utils.c
+++ b/source/blender/editors/armature/armature_utils.c
@@ -48,6 +48,8 @@
 
 #include "armature_intern.h"
 
+#include <stddef.h> /* for offsetof */
+
 /* *************************************************************** */
 /* Validation */
 
diff --git a/source/blender/editors/curve/editcurve.c b/source/blender/editors/curve/editcurve.c
index 159fbb0..8d43215 100644
--- a/source/blender/editors/curve/editcurve.c
+++ b/source/blender/editors/curve/editcurve.c
@@ -77,6 +77,8 @@
 #include "RNA_define.h"
 #include "RNA_enum_types.h"
 
+#include <stddef.h> /* for offsetof */
+
 /* Undo stuff */
 typedef struct {
 	ListBase nubase;
diff --git a/source/blender/editors/gpencil/drawgpencil.c b/source/blender/editors/gpencil/drawgpencil.c
index dc3f7c4..3bfa5e6 100644
--- a/source/blender/editors/gpencil/drawgpencil.c
+++ b/source/blender/editors/gpencil/drawgpencil.c
@@ -220,7 +220,7 @@ static void gp_draw_stroke_3d(bGPDspoint *points, int totpoints, short thickness
 		if (fabsf(pt->pressure - curpressure) > 0.2f / (float)thickness) {
 			gpuEnd();
 			curpressure = pt->pressure;
-			gpulLineWidth(curpressure * thickness);
+			gpuLineWidth(curpressure * thickness);
 			gpuBegin(GL_LINE_STRIP);
 			
 			/* need to roll-back one point to ensure that there are no gaps in the stroke */
diff --git a/source/blender/editors/include/ED_armature.h b/source/blender/editors/include/ED_armature.h
index 61fcdc8..704a64b 100644
--- a/source/blender/editors/include/ED_armature.h
+++ b/source/blender/editors/include/ED_armature.h
@@ -128,7 +128,7 @@ bool mouse_armature(struct bContext *C, const int mval[2], bool extend, bool des
 int join_armature_exec(struct bContext *C, struct wmOperator *op);
 struct Bone *get_indexed_bone(struct Object *ob, int index);
 float ED_rollBoneToVector(EditBone *bone, const float new_up_axis[3], const short axis_only);
-EditBone *ED_armature_bone_find_name(const ListBase *edbo, const char *name);
+EditBone *ED_armature_bone_find_name(const struct ListBase *edbo, const char *name);
 EditBone *ED_armature_bone_get_mirrored(const struct ListBase *edbo, EditBone *ebo);
 void ED_armature_sync_selection(struct ListBase *edbo);
 void ED_armature_validate_active(struct bArmature *arm);
diff --git a/source/blender/editors/interface/interface_draw.c b/source/blender/editors/interface/interface_draw.c
index f3a3403..1ebf3e8 100644
--- a/source/blender/editors/interface/interface_draw.c
+++ b/source/blender/editors/interface/interface_draw.c
@@ -1033,16 +1033,14 @@ void ui_draw_but_COLORBAND(uiBut *but, uiWidgetColors *UNUSED(wcol), const rcti
 	gpuColor4ub(UI_ALPHA_CHECKER_DARK, UI_ALPHA_CHECKER_DARK, UI_ALPHA_CHECKER_DARK, 255);
 	gpuDrawFilledRectf(x1, y1, x1 + sizex, y1 + sizey);
 
-	gpuColor4ub(UI_ALPHA_CHECKER_LIGHT, UI_ALPHA_CHECKER_LIGHT, UI_ALPHA_CHECKER_LIGHT, 255);
-	gpuPolygonStipple(stipple_checker_8px);
+	GPU_raster_begin();
 	GPU_aspect_enable(GPU_ASPECT_RASTER, GPU_RASTER_POLYGON|GPU_RASTER_STIPPLE);
+	gpuPolygonStipple(stipple_checker_8px);
 
-	gpuColor4ub(UI_TRANSP_LIGHT, UI_TRANSP_LIGHT, UI_TRANSP_LIGHT, 255);
-	gpuPolygonStipple(checker_stipple_sml);
+	gpuColor4ub(UI_ALPHA_CHECKER_LIGHT, UI_ALPHA_CHECKER_LIGHT, UI_ALPHA_CHECKER_LIGHT, 255);
 	gpuDrawFilledRectf(x1, y1, x1 + sizex, y1 + sizey);
 
 	GPU_aspect_disable(GPU_ASPECT_RASTER, GPU_RASTER_POLYGON|GPU_RASTER_STIPPLE);
-
 	GPU_raster_end();
 
 	// SSS Enable Smooth
diff --git a/source/blender/editors/interface/interface_panel.c b/source/blender/editors/interface/interface_panel.c
index 2bfbe8d..2b79b11 100644
--- a/source/blender/editors/interface/interface_panel.c
+++ b/source/blender/editors/interface/interface_panel.c
@@ -71,6 +71,8 @@
 
 #include "interface_intern.h"
 
+#include <stddef.h> /* for offsetof */
+
 /*********************** defines and structs ************************/
 
 #define ANIMATION_TIME      0.30
diff --git a/source/blender/editors/mask/mask_draw.c b/source/blender/editors/mask/mask_draw.c
index 70b104f..d2177f6 100644
--- a/source/blender/editors/mask/mask_draw.c
+++ b/source/blender/editors/mask/mask_draw.c
@@ -40,6 +40,8 @@
 #include "BKE_context.h"
 #include "BKE_mask.h"
 
+#include "BIF_glutil.h"
+
 #include "DNA_mask_types.h"
 #include "DNA_screen_types.h"
 #include "DNA_object_types.h"   /* SELECT */
diff --git a/source/blender/editors/mesh/CMakeLists.txt b/source/blender/editors/mesh/CMakeLists.txt
index 772246f..9acc632 100644
--- a/source/blender/editors/mesh/CMakeLists.txt
+++ b/source/blender/editors/mesh/CMakeLists.txt
@@ -27,7 +27,6 @@ set(INC
 	../../bmesh
 	../../gpu
 	../../imbuf
-	../../gpu
 	../../makesdna
 	../../makesrna
 	../../render/extern/include
diff --git a/source/blender/editors/screen/CMakeLists.txt b/source/blender/editors/screen/CMakeLists.txt
index d31b7d1..

@@ Diff output truncated at 10240 characters. @@




More information about the Bf-blender-cvs mailing list