[Bf-blender-cvs] [a50acf3] wiggly-widgets: Merge branch 'master' into wiggly-widgets

Campbell Barton noreply at git.blender.org
Mon Jan 4 17:29:33 CET 2016


Commit: a50acf34e7ae634997b44d76aee6f789ae0deb0c
Author: Campbell Barton
Date:   Tue Jan 5 03:17:43 2016 +1100
Branches: wiggly-widgets
https://developer.blender.org/rBa50acf34e7ae634997b44d76aee6f789ae0deb0c

Merge branch 'master' into wiggly-widgets

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



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

diff --cc source/blender/gpu/intern/gpu_buffers.c
index e60dcaa,a2a604f..d121936
--- a/source/blender/gpu/intern/gpu_buffers.c
+++ b/source/blender/gpu/intern/gpu_buffers.c
@@@ -781,24 -769,6 +780,24 @@@ void GPU_triangle_setup(struct DerivedM
  	GLStates |= GPU_BUFFER_ELEMENT_STATE;
  }
  
 +void GPU_facemap_setup(DerivedMesh *dm)
 +{
- 	if (!gpu_buffer_setup_common(dm, GPU_BUFFER_FACEMAP))
++	if (!gpu_buffer_setup_common(dm, GPU_BUFFER_FACEMAP, false))
 +		return;
 +	
- 	if (!gpu_buffer_setup_common(dm, GPU_BUFFER_VERTEX))
++	if (!gpu_buffer_setup_common(dm, GPU_BUFFER_VERTEX, false))
 +		return;
 +
 +	glEnableClientState(GL_VERTEX_ARRAY);
 +	glBindBuffer(GL_ARRAY_BUFFER_ARB, dm->drawObject->points->id);
 +	glVertexPointer(3, GL_FLOAT, 0, 0);
 +	
 +	GLStates |= GPU_BUFFER_VERTEX_STATE;
 +	glBindBufferARB(GL_ELEMENT_ARRAY_BUFFER_ARB, dm->drawObject->facemapindices->id);
 +	
 +	GLStates |= GPU_BUFFER_ELEMENT_STATE;
 +}
 +
  static int GPU_typesize(int type)
  {
  	switch (type) {
diff --cc source/blenderplayer/bad_level_call_stubs/stubs.c
index d27241d,5748b9e..8b000b6
--- a/source/blenderplayer/bad_level_call_stubs/stubs.c
+++ b/source/blenderplayer/bad_level_call_stubs/stubs.c
@@@ -510,10 -498,8 +510,10 @@@ void ED_object_constraint_tag_update(st
  void ED_vgroup_vert_add(struct Object *ob, struct bDeformGroup *dg, int vertnum, float weight, int assignmode) RET_NONE
  void ED_vgroup_vert_remove(struct Object *ob, struct bDeformGroup *dg, int vertnum) RET_NONE
  float ED_vgroup_vert_weight(struct Object *ob, struct bDeformGroup *dg, int vertnum) RET_ZERO
 +void ED_fmap_face_add(struct Object *ob, struct bFaceMap *fmap, int facenum) RET_NONE
 +void ED_fmap_face_remove(struct Object *ob, struct bFaceMap *fmap, int facenum) RET_NONE
- int ED_mesh_mirror_topo_table(struct Object *ob, char mode) RET_ZERO
- int ED_mesh_mirror_spatial_table(struct Object *ob, struct BMEditMesh *em, const float co[3], char mode) RET_ZERO
+ int ED_mesh_mirror_topo_table(struct Object *ob, struct DerivedMesh *dm, char mode) RET_ZERO
+ int ED_mesh_mirror_spatial_table(struct Object *ob, struct BMEditMesh *em, struct DerivedMesh *dm, const float co[3], char mode) RET_ZERO
  
  float ED_rollBoneToVector(EditBone *bone, const float new_up_axis[3], const bool axis_only) RET_ZERO
  void ED_space_image_get_size(struct SpaceImage *sima, int *width, int *height) RET_NONE




More information about the Bf-blender-cvs mailing list