c41ce58fde 
					 
					
						
						
							
							Fix indentation, spacing and added comments  
						
						 
						
						
						
						
					 
					
						2018-08-05 08:39:20 +05:30  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						ef8ab3b4c2 
					 
					
						
						
							
							Fix issues after last 2.8 merge.  
						
						 
						
						
						
						
					 
					
						2018-08-01 14:21:45 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						936d1cef6e 
					 
					
						
						
							
							Merge branch 'blender2.8' into soc-2018-bevel  
						
						 
						
						... 
						
						
						
						Conflicts:
	release/scripts/addons
	release/scripts/startup/bl_ui/space_view3d_toolbar.py
	source/blender/editors/space_outliner/outliner_draw.c 
						
						
					 
					
						2018-08-01 14:16:41 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						1f809f34c1 
					 
					
						
						
							
							Merge branch 'master' into blender2.8  
						
						 
						
						
						
						
					 
					
						2018-07-26 18:39:57 +10:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						ab67c6e46b 
					 
					
						
						
							
							WM: replace UI draw callbacks w/ property poll  
						
						 
						
						... 
						
						
						
						Custom drawing functions were used just to control property display.
Move to poll function. 
						
						
					 
					
						2018-07-26 17:35:33 +10:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						2e12114f3b 
					 
					
						
						
							
							Merge branch 'master' into blender2.8  
						
						 
						
						
						
						
					 
					
						2018-07-26 14:45:14 +10:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						dbd79c097c 
					 
					
						
						
							
							WM: Add operator property poll callback  
						
						 
						
						... 
						
						
						
						This allows operators to filter out properties from the
auto-generated draw functions.
Some custom draw functions can move to using this. 
						
						
					 
					
						2018-07-26 11:53:53 +10:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						190d1b2f7a 
					 
					
						
						
							
							Fixed merge errors  
						
						 
						
						
						
						
					 
					
						2018-07-03 19:01:20 +05:30  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						31e43d021f 
					 
					
						
						
							
							Merge branch 'blender2.8' into soc-2018-bevel  
						
						 
						
						
						
						
					 
					
						2018-07-02 23:31:19 +05:30  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						a61480c271 
					 
					
						
						
							
							Merge branch 'master' into blender2.8  
						
						 
						
						
						
						
					 
					
						2018-06-26 22:56:39 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						ecb56eac57 
					 
					
						
						
							
							UI: Add/Update bad tooltips  
						
						 
						
						... 
						
						
						
						Part of T51061 
						
						
					 
					
						2018-06-26 12:29:11 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						c73a6b0d42 
					 
					
						
						
							
							Merge branch 'blender2.8' into soc-2018-bevel  
						
						 
						
						
						
						
					 
					
						2018-06-20 22:29:44 +05:30  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						4943739b89 
					 
					
						
						
							
							Merge branch 'master' into blender2.8  
						
						 
						
						... 
						
						
						
						Conflicts:
	source/blender/blenloader/intern/readfile.c
	source/blender/editors/mesh/editmesh_utils.c
	source/blenderplayer/bad_level_call_stubs/stubs.c 
						
						
					 
					
						2018-06-13 16:42:56 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						f61c30f804 
					 
					
						
						
							
							Cleanup: get rid of last G.main in BMesh code.  
						
						 
						
						
						
						
					 
					
						2018-06-13 16:29:12 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						98e0bd90f4 
					 
					
						
						
							
							WM: hide internal operator settings  
						
						 
						
						... 
						
						
						
						These are set in the interface and aren't useful to show to users.
Other minor changes
- Rename 'Ruler/Protractor' -> 'Ruler'
- Rename Subdivide 'Quad/Tri Mode' -> 'Create N-Gons' (and invert). 
						
						
					 
					
						2018-06-12 22:00:22 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						1255129932 
					 
					
						
						
							
							Merge branch 'blender2.8' into soc-2018-bevel  
						
						 
						
						
						
						
					 
					
						2018-06-11 21:03:07 +05:30  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						0c6410ec0c 
					 
					
						
						
							
							Added ability to harden normals.  
						
						 
						
						... 
						
						
						
						Uses 2 different params: mode and strength. There are still some
hiccups with how 2.8 interacts with normals. Will resolve as
support gets better 
						
						
					 
					
						2018-06-11 11:58:26 +05:30  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						94aa4d1657 
					 
					
						
						
							
							Merge branch 'master' into blender2.8  
						
						 
						
						... 
						
						
						
						Conflicts:
	source/blender/blenkernel/BKE_sequencer.h
	source/blender/blenkernel/intern/sequencer.c
	source/blender/editors/curve/editcurve_paint.c
	source/blender/editors/gpencil/gpencil_edit.c
	source/blender/editors/gpencil/gpencil_paint.c
	source/blender/editors/gpencil/gpencil_utils.c
	source/blender/editors/include/ED_object.h
	source/blender/editors/include/ED_view3d.h
	source/blender/editors/interface/interface_eyedropper_depth.c
	source/blender/editors/render/render_opengl.c
	source/blender/editors/sculpt_paint/paint_image_proj.c
	source/blender/editors/sculpt_paint/sculpt.c
	source/blender/editors/space_view3d/drawobject.c
	source/blender/editors/space_view3d/view3d_draw.c
	source/blender/editors/space_view3d/view3d_edit.c
	source/blender/editors/space_view3d/view3d_intern.h
	source/blender/editors/space_view3d/view3d_select.c
	source/blender/editors/space_view3d/view3d_utils.c
	source/blender/editors/transform/transform_conversions.c
	source/blender/editors/transform/transform_snap.c
	source/blender/python/intern/gpu_offscreen.c
	source/blender/windowmanager/intern/wm_files.c 
						
						
					 
					
						2018-06-08 14:38:57 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						95011f6d48 
					 
					
						
						
							
							Merge branch 'master' into blender2.8  
						
						 
						
						
						
						
					 
					
						2018-06-04 09:39:04 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						8f670dd855 
					 
					
						
						
							
							Merge branch 'master' into blender2.8  
						
						 
						
						... 
						
						
						
						Conflicts:
	source/blender/blenkernel/BKE_material.h
	source/blender/blenkernel/BKE_mesh.h
	source/blender/blenkernel/intern/library_remap.c
	source/blender/blenkernel/intern/material.c
	source/blender/editors/object/object_relations.c
	source/blender/editors/render/render_preview.c
	source/blender/makesrna/intern/rna_object.c 
						
						
					 
					
						2018-05-29 16:02:53 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						f7af08b5fe 
					 
					
						
						
							
							Cleanup: Get rid of G.main in BKE_material.  
						
						 
						
						... 
						
						
						
						Note that in some cases, this only moves the G.main case to somne other
places - in particular, RNA getters/setters are becoming annoying here... 
						
						
					 
					
						2018-05-29 15:49:21 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						842245ac55 
					 
					
						
						
							
							Merge branch 'blender2.8' into soc-2018-bevel  
						
						 
						
						
						
						
					 
					
						2018-05-29 11:10:54 +05:30  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						5d2d36b068 
					 
					
						
						
							
							Applied soc-2017-normal-tools  
						
						 
						
						
						
						
					 
					
						2018-05-25 22:24:24 +05:30  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						bc9b202e65 
					 
					
						
						
							
							Fix split only checking selected faces  
						
						 
						
						
						
						
					 
					
						2018-05-25 08:31:26 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						a0dbaf1d9d 
					 
					
						
						
							
							ED_transform_snap_object: remove unused bmain parameter in context creation.  
						
						 
						
						
						
						
					 
					
						2018-05-24 19:09:01 -03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						302fea6b61 
					 
					
						
						
							
							Change defaults  
						
						 
						
						... 
						
						
						
						- Vertex/Edge Slide: Correct UV's = ON
- Extrude Along Normals: Even Thickness = ON
- Laplacian Smooth: Lambda Factor = 1.0
- UV/Image Editor: Normalized Coordinates = ON
- Render Image: Dithering = 1
- Image Sequence Auto Refresh = ON
See T54943 
						
						
					 
					
						2018-05-24 21:33:39 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						b2ee8e1cba 
					 
					
						
						
							
							Fix typo in editmesh edge delete  
						
						 
						
						
						
						
					 
					
						2018-05-24 17:49:44 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						f99197fb2d 
					 
					
						
						
							
							Transform: Support mixed snap in 3d View.  
						
						 
						
						... 
						
						
						
						Allows more than one snap mode to be enabled. So different combinations are possible.
Reviewers: campbellbarton
Reviewed By: campbellbarton
Subscribers: Christopher_Anderssarian, duarteframos
Tags: #bf_blender_2.8
Differential Revision: D3400 
						
						
					 
					
						2018-05-22 08:58:56 -03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						67cf4cb5ec 
					 
					
						
						
							
							Cleanup: replace MEM_SAFE_FREE -> MEM_freeN  
						
						 
						
						... 
						
						
						
						No need to check for NULL in this case. 
						
						
					 
					
						2018-05-22 07:28:14 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						12eb29fe35 
					 
					
						
						
							
							Cleanup: whitespace, duplicate includes  
						
						 
						
						
						
						
					 
					
						2018-05-20 08:52:56 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						50c29e2391 
					 
					
						
						
							
							Cleanup: pass the use_depth parameter to the SnapObjectParams struct in the ED_transform_snap_object_project_view3d_mixed.  
						
						 
						
						
						
						
					 
					
						2018-05-15 14:32:30 -03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						627a783784 
					 
					
						
						
							
							Fix error in MESH_OT_edge_face_add changes  
						
						 
						
						... 
						
						
						
						Context sensitive create also needs to check selected vertices.
Also correct indentation. 
						
						
					 
					
						2018-05-14 16:35:51 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Dalai Felinto 
							
						 
					 
					
						
						
							
						
						fc7316fb54 
					 
					
						
						
							
							Multi-Objects: MESH_OT_vert_connect_path by Falk David  
						
						 
						
						... 
						
						
						
						With a few changes:
* Use space after if.
* Skip for loop when no selected vertices.
Maniphest Tasks: T54643
Differential Revision: https://developer.blender.org/D3349  
						
						
					 
					
						2018-05-14 15:56:26 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Dalai Felinto 
							
						 
					 
					
						
						
							
						
						de2d642c84 
					 
					
						
						
							
							Multi-Objects: MESH_OT_edge_face_add by Guy Boicey  
						
						 
						
						... 
						
						
						
						With changes by Dalai Felinto:
* Indentation
* Skip for loop when no vert/edge are selected
Maniphest Tasks: T54643
Differential Revision: https://developer.blender.org/D3233  
						
						
					 
					
						2018-05-14 15:47:51 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Dalai Felinto 
							
						 
					 
					
						
						
							
						
						4043e4b820 
					 
					
						
						
							
							Multi-Object: MESH_OT_vert_connect_concave by Guy Boicey  
						
						 
						
						... 
						
						
						
						Maniphest Tasks: T54643
Differential Revision: https://developer.blender.org/D3255  
						
						
					 
					
						2018-05-14 14:56:40 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Dalai Felinto 
							
						 
					 
					
						
						
							
						
						b942106c73 
					 
					
						
						
							
							Multi-Object: MESH_OT_vert_connect_nonplanar by Aeden McClain  
						
						 
						
						... 
						
						
						
						With indentation fixes by Dalai Felinto.
Maniphest Tasks: T54643
Differential Revision: https://developer.blender.org/D3312  
						
						
					 
					
						2018-05-14 13:04:01 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Dalai Felinto 
							
						 
					 
					
						
						
							
						
						e1cee0ac71 
					 
					
						
						
							
							Multi-Object: MESH_OT_convex_hull by Lucas Boutrot  
						
						 
						
						... 
						
						
						
						Maniphest Tasks: T54643
Differential Revision: https://developer.blender.org/D3223  
						
						
					 
					
						2018-05-14 12:20:15 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Dalai Felinto 
							
						 
					 
					
						
						
							
						
						1fd4449762 
					 
					
						
						
							
							Fix memleak on MESH_OT_tris_convert_to_quads  
						
						 
						
						
						
						
					 
					
						2018-05-11 10:52:46 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						b726ff4fc4 
					 
					
						
						
							
							EditMesh: multi-object triangle fill  
						
						 
						
						... 
						
						
						
						D3336 by @nabbydude 
						
						
					 
					
						2018-05-11 08:41:04 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						266638d783 
					 
					
						
						
							
							EditMesh: multi-object recalculate normals  
						
						 
						
						... 
						
						
						
						D3298 by @leonlg 
						
						
					 
					
						2018-05-11 08:08:01 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						83a83a3d4b 
					 
					
						
						
							
							Cleanup: whitespace, duplicate includes  
						
						 
						
						
						
						
					 
					
						2018-05-11 07:43:20 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						b73c7381cc 
					 
					
						
						
							
							EditMesh: multi-edit merge  
						
						 
						
						... 
						
						
						
						D3226 by @pragma37 
Note: edited so first/last option only applies to active mesh
since this doesn't make much sense to apply across objects. 
						
						
					 
					
						2018-05-09 14:34:06 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Dalai Felinto 
							
						 
					 
					
						
						
							
						
						e42b8c32ab 
					 
					
						
						
							
							Multi-object edit: MESH_OT_beautify_fill by Remi van der Laan  
						
						 
						
						... 
						
						
						
						Maniphest Tasks: T54643, T54641
Differential Revision: https://developer.blender.org/D3291  
						
						
					 
					
						2018-05-09 13:48:01 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Dalai Felinto 
							
						 
					 
					
						
						
							
						
						5e915baec4 
					 
					
						
						
							
							Multi-Object-Editing: MESH_OT_separate by Nick Milios  
						
						 
						
						... 
						
						
						
						Patch description:
- Reports "Nothing selected" only when all objects has no selection
  and it is in  Separate type(Mode)
- Tested all types (Seperate/By Material/By loose parts)
- Instead of using
```
BKE_view_layer_array_from_objects_in_edit_mode_unique_data
```
I used
```
BKE_view_layer_array_from_bases_in_edit_mode_unique_data
```
Because it needs the "Base" not the "Object" itself.
Maniphest Tasks: T54643
Differential Revision: https://developer.blender.org/D3267  
						
						
					 
					
						2018-05-09 12:13:09 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Dalai Felinto 
							
						 
					 
					
						
						
							
						
						944054fbb6 
					 
					
						
						
							
							Multi-Object-Editing: MESH_OT_vert_connect by Nick Milios  
						
						 
						
						... 
						
						
						
						With changes: Skip loop when totvertsel is not 2
Maniphest Tasks: T54643
Differential Revision: https://developer.blender.org/D3273  
						
						
					 
					
						2018-05-09 11:48:39 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Dalai Felinto 
							
						 
					 
					
						
						
							
						
						1cbe3b6e03 
					 
					
						
						
							
							Multi-Object-Editing : Support for Grid Fill by Falk David  
						
						 
						
						... 
						
						
						
						With minor changes:
* Have BMOperator declaration close to its initialization.
* Move const use_prepare and const use_interp_simple outside the for loop.
Maniphest Tasks: T54643
Differential Revision: https://developer.blender.org/D3222  
						
						
					 
					
						2018-05-09 10:53:38 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						a48186c5d7 
					 
					
						
						
							
							Orientation for 3D cursor  
						
						 
						
						... 
						
						
						
						Currently set when setting the cursor location,
optionally used as an orientation type.
Intended for use by tools too.
See: D3208 
						
						
					 
					
						2018-05-08 15:35:04 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Dalai Felinto 
							
						 
					 
					
						
						
							
						
						d915aa57f8 
					 
					
						
						
							
							Multi-Object-Editing: vertices smooth by Jefferson Rausseo  
						
						 
						
						... 
						
						
						
						Changes by me:
* Identation (tabs not space)
* Moving RNA_.*_get outside for loop)
Maniphest Tasks: T54643
Differential Revision: https://developer.blender.org/D3230  
						
						
					 
					
						2018-05-08 11:33:27 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Dalai Felinto 
							
						 
					 
					
						
						
							
						
						faaffc4011 
					 
					
						
						
							
							Edit Mesh: multi-object rotate_uvs support by Pablo Dobarro  
						
						 
						
						... 
						
						
						
						Changes by me: Moving RNA_.*get outside for loop and indentation fix.
Maniphest Tasks: T54643
Differential Revision: https://developer.blender.org/D3221  
						
						
					 
					
						2018-05-08 11:15:00 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Dalai Felinto 
							
						 
					 
					
						
						
							
						
						63951bc987 
					 
					
						
						
							
							Edit Mesh: multi-object reverse_uvs support by Pablo Dobarro  
						
						 
						
						... 
						
						
						
						Maniphest Tasks: T54643
Differential Revision: https://developer.blender.org/D3220  
						
						
					 
					
						2018-05-08 11:09:35 +02:00