[Bf-blender-cvs] [7f822bb] gooseberry: Merge branch 'master' into gooseberry

Antony Riakiotakis noreply at git.blender.org
Wed Mar 25 12:39:49 CET 2015


Commit: 7f822bb4dd4187f6fab916ea8943ec039394ad47
Author: Antony Riakiotakis
Date:   Wed Mar 25 12:39:38 2015 +0100
Branches: gooseberry
https://developer.blender.org/rB7f822bb4dd4187f6fab916ea8943ec039394ad47

Merge branch 'master' into gooseberry

Conflicts:
	source/blender/gpu/intern/gpu_buffers.c

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



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

diff --cc source/blender/blenloader/intern/versioning_270.c
index 35470e6,50cd393..206b498
--- a/source/blender/blenloader/intern/versioning_270.c
+++ b/source/blender/blenloader/intern/versioning_270.c
@@@ -38,8 -38,8 +38,9 @@@
  #include "DNA_camera_types.h"
  #include "DNA_cloth_types.h"
  #include "DNA_constraint_types.h"
 +#include "DNA_key_types.h"
  #include "DNA_sdna_types.h"
+ #include "DNA_sequence_types.h"
  #include "DNA_space_types.h"
  #include "DNA_screen_types.h"
  #include "DNA_object_types.h"
diff --cc source/blender/editors/space_sequencer/sequencer_intern.h
index 37b801d,8db0df5..d426ed6
--- a/source/blender/editors/space_sequencer/sequencer_intern.h
+++ b/source/blender/editors/space_sequencer/sequencer_intern.h
@@@ -131,10 -131,8 +131,10 @@@ void SEQUENCER_OT_copy(struct wmOperato
  void SEQUENCER_OT_paste(struct wmOperatorType *ot);
  
  void SEQUENCER_OT_rebuild_proxy(struct wmOperatorType *ot);
- void SEQUENCER_OT_enable_proxies(struct wmOperatorType *ot);
+ void SEQUENCER_OT_copy_proxy_settings(struct wmOperatorType *ot);
  
 +void SEQUENCER_OT_overdrop_transform(struct wmOperatorType *ot);
 +
  /* preview specific operators */
  void SEQUENCER_OT_view_all_preview(struct wmOperatorType *ot);
  
diff --cc source/blender/gpu/GPU_buffers.h
index 69e1ddd,54153cf..629ac51
--- a/source/blender/gpu/GPU_buffers.h
+++ b/source/blender/gpu/GPU_buffers.h
@@@ -50,14 -50,11 +50,14 @@@ struct GSet
  struct GPUVertPointLink;
  struct PBVH;
  
 +typedef void (*GPUBufferCopyFunc)(DerivedMesh *dm, float *varray, int *index,
 +                                  int *mat_orig_to_new, void *user_data);
 +
  typedef struct GPUBuffer {
- 	int size;	/* in bytes */
- 	void *pointer;	/* used with vertex arrays */
- 	unsigned int id;	/* used with vertex buffer objects */
- 	bool use_vbo;	/* true for VBOs, false for vertex arrays */
+ 	int size;        /* in bytes */
+ 	void *pointer;   /* used with vertex arrays */
+ 	unsigned int id; /* used with vertex buffer objects */
+ 	bool use_vbo;    /* true for VBOs, false for vertex arrays */
  } GPUBuffer;
  
  typedef struct GPUBufferMaterial {




More information about the Bf-blender-cvs mailing list