[Bf-blender-cvs] [3102ced] gooseberry: Merge branch 'wiggly-widgets' into gooseberry

Antony Riakiotakis noreply at git.blender.org
Wed Nov 19 16:51:36 CET 2014


Commit: 3102ced86466749f5cb0a99599588d0ac0fdf365
Author: Antony Riakiotakis
Date:   Wed Nov 19 16:48:04 2014 +0100
Branches: gooseberry
https://developer.blender.org/rB3102ced86466749f5cb0a99599588d0ac0fdf365

Merge branch 'wiggly-widgets' into gooseberry

Conflicts:
	source/blender/editors/include/ED_view3d.h
	source/blender/editors/space_view3d/view3d_draw.c
	source/blender/editors/transform/transform_manipulator.c

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



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

diff --cc source/blender/editors/include/ED_view3d.h
index b51e210,592448f..5ecb938
--- a/source/blender/editors/include/ED_view3d.h
+++ b/source/blender/editors/include/ED_view3d.h
@@@ -61,9 -62,8 +62,11 @@@ struct rcti
  struct wmOperator;
  struct wmOperatorType;
  struct wmWindow;
 +struct GPUFX;
 +struct GPUOffScreen;
 +struct GPUFXOptions;
+ struct wmWidget;
+ struct wmWidgetGroup;
  
  /* for derivedmesh drawing callbacks, for view3d_select, .... */
  typedef struct ViewContext {




More information about the Bf-blender-cvs mailing list