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

Julian Eisel noreply at git.blender.org
Tue May 3 21:05:55 CEST 2016


Commit: f9f34b5043540382c9606b6698433b2ac39a4994
Author: Julian Eisel
Date:   Tue May 3 21:02:54 2016 +0200
Branches: wiggly-widgets
https://developer.blender.org/rBf9f34b5043540382c9606b6698433b2ac39a4994

Merge branch 'master' into wiggly-widgets

Conflicts:
	source/blender/editors/include/ED_transform.h
	source/blender/editors/include/ED_view3d.h
	source/blender/editors/screen/screen_edit.c

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



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

diff --cc source/blender/blenloader/intern/versioning_270.c
index 7682643,54b2582..f22399b
--- a/source/blender/blenloader/intern/versioning_270.c
+++ b/source/blender/blenloader/intern/versioning_270.c
@@@ -1084,44 -1084,21 +1084,60 @@@ void blo_do_versions_270(FileData *fd, 
  			}
  		}
  
+ 		for (Scene *scene = main->scene.first; scene; scene = scene->id.next) {
+ 			Sequence *seq;
+ 
+ 			SEQ_BEGIN (scene->ed, seq)
+ 			{
+ 				if (seq->type == SEQ_TYPE_TEXT) {
+ 					TextVars *data = seq->effectdata;
+ 					if (data->color[3] == 0.0f) {
+ 						copy_v4_fl(data->color, 1.0f);
+ 						data->shadow_color[3] = 1.0f;
+ 					}
+ 				}
+ 			}
+ 			SEQ_END
+ 		}
+ 
  	}
 +
 +	{
 +		if (!DNA_struct_elem_find(fd->filesdna, "SpaceNode", "float", "backdrop_zoom")) {
 +			bScreen *sc;
 +			for (sc = main->screen.first; sc; sc = sc->id.next) {
 +				ScrArea *sa;
 +				for (sa = sc->areabase.first; sa; sa = sa->next) {
 +					SpaceLink *sl;
 +					for (sl = sa->spacedata.first; sl; sl = sl->next) {
 +						if (sl->spacetype == SPACE_NODE) {
 +							SpaceNode *snode = (SpaceNode *)sl;
 +							snode->backdrop_zoom = 1.0;
 +						}
 +						if (sl->spacetype == SPACE_SEQ) {
 +							SpaceSeq *sseq = (SpaceSeq *)sl;
 +							sseq->overdrop_zoom = 1.0;
 +						}
 +					}
 +				}
 +			}
 +		}
 +
 +		if (!DNA_struct_elem_find(fd->filesdna, "SpaceIpo", "float", "backdrop_zoom")) {
 +			bScreen *sc;
 +			for (sc = main->screen.first; sc; sc = sc->id.next) {
 +				ScrArea *sa;
 +				for (sa = sc->areabase.first; sa; sa = sa->next) {
 +					SpaceLink *sl;
 +					for (sl = sa->spacedata.first; sl; sl = sl->next) {
 +						if (sl->spacetype == SPACE_IPO) {
 +							SpaceIpo *sipo = (SpaceIpo *)sl;
 +							sipo->backdrop_zoom = 1.0f;
 +							sipo->backdrop_opacity = 0.7f;
 +						}
 +					}
 +				}
 +			}
 +		}
 +	}
  }
diff --cc source/blender/editors/include/ED_transform.h
index 1fd2093,39df52e..ab33433
--- a/source/blender/editors/include/ED_transform.h
+++ b/source/blender/editors/include/ED_transform.h
@@@ -45,8 -43,8 +45,10 @@@ struct wmEvent
  struct wmKeyConfig;
  struct wmKeyMap;
  struct wmOperatorType;
+ struct Main;
+ struct SnapObjectContext;
 +struct wmWindowManager;
 +struct PointerRNA;
  
  void transform_keymap_for_space(struct wmKeyConfig *keyconf, struct wmKeyMap *keymap, int spaceid);
  void transform_operatortypes(void);
diff --cc source/blender/editors/include/ED_view3d.h
index 7d984ef,c23c2ee..3510617
--- a/source/blender/editors/include/ED_view3d.h
+++ b/source/blender/editors/include/ED_view3d.h
@@@ -401,21 -396,6 +401,9 @@@ void ED_view3d_operator_properties_view
  void ED_view3d_operator_properties_viewmat_get(struct wmOperator *op, int *winx, int *winy, float persmat[4][4]);
  #endif
  
- bool ED_view3d_snap_from_region(
-         struct Scene *scene, struct View3D *v3d, struct ARegion *ar,
-         const float mval[2], float dist_px,
-         bool use_depth, bool use_obedit,
-         bool use_vert, bool use_edge, bool use_face,
-         float r_co[3], float r_no[3]);
- 
- bool ED_view3d_snap_from_ray(
-         struct Scene *scene,
-         const float ray_start[3], const float ray_normal[3],
-         float r_co[3]);
- 
 +int WIDGETGROUP_lamp_poll(const struct bContext *C, struct wmWidgetGroupType *wgrouptype);
 +void WIDGETGROUP_lamp_create(const struct bContext *C, struct wmWidgetGroup *wgroup);
 +
  /* render */
  void ED_view3d_stop_render_preview(struct wmWindowManager *wm, struct ARegion *ar);
  void ED_view3d_shade_update(struct Main *bmain, struct Scene *scene, struct View3D *v3d, struct ScrArea *sa);
diff --cc source/blender/editors/screen/screen_edit.c
index 8a55732,23c6aa3..d72fc05
--- a/source/blender/editors/screen/screen_edit.c
+++ b/source/blender/editors/screen/screen_edit.c
@@@ -1064,19 -1064,11 +1064,13 @@@ bScreen *ED_screen_duplicate(wmWindow *
  /* screen sets cursor based on swinid */
  static void region_cursor_set(wmWindow *win, int swinid, int swin_changed)
  {
- 	ScrArea *sa = win->screen->areabase.first;
- 	
- 	for (; sa; sa = sa->next) {
- 		ARegion *ar = sa->regionbase.first;
- 		for (; ar; ar = ar->next) {
+ 	for (ScrArea *sa = win->screen->areabase.first; sa; sa = sa->next) {
+ 		for (ARegion *ar = sa->regionbase.first; ar; ar = ar->next) {
  			if (ar->swinid == swinid) {
  				if (swin_changed || (ar->type && ar->type->event_cursor)) {
 +					if (WM_widgetmap_cursor_set(ar->widgetmaps.first, win))
 +						return;
- 					if (ar->type && ar->type->cursor)
- 						ar->type->cursor(win, sa, ar);
- 					else
- 						WM_cursor_set(win, CURSOR_STD);
+ 					ED_region_cursor_set(win, sa, ar);
  				}
  				return;
  			}




More information about the Bf-blender-cvs mailing list