d4913af846 
					 
					
						
						
							
							Merge branch 'master' into blender2.8  
						
						 
						
						... 
						
						
						
						# Conflicts:
#	source/blender/blenloader/intern/writefile.c 
						
						
					 
					
						2017-02-08 13:10:16 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						5ad5bb235b 
					 
					
						
						
							
							fix most UI text color  
						
						 
						
						... 
						
						
						
						There are still many places to fix. I'll miss the bright yellow!
This commit also uses the new BLF_default function where possible.
Part of T49043 since we call glColor less often. 
						
						
					 
					
						2017-02-05 00:54:21 -05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						0b4a9caf51 
					 
					
						
						
							
							Forgotten in committee  ddf99214dc 
						
						 
						
						... 
						
						
						
						In obect mode, the rotation matrix need to be restored to the initial value if a snap point is not found 
						
						
					 
					
						2017-02-03 12:57:02 -03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						ddf99214dc 
					 
					
						
						
							
							fix T49494: snap_align_rotation should use a local pivot to make the transformation  
						
						 
						
						... 
						
						
						
						The problem was simple, just transform the global coordinates of t->tsnap.snapTarget to local coordinates.
(Some comments were added to the code) 
						
						
					 
					
						2017-02-03 02:27:57 -03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Julian Eisel 
							
						 
					 
					
						
						
							
						
						1814241526 
					 
					
						
						
							
							Merge branch 'master' into blender2.8  
						
						 
						
						... 
						
						
						
						Conflicts:
	source/blender/editors/space_action/action_draw.c 
						
						
					 
					
						2017-01-22 21:16:00 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						8aa8165e85 
					 
					
						
						
							
							OpenGL: convert legacy calls in transform.c  
						
						 
						
						... 
						
						
						
						Took pieces from D2316 and D2359, changed a few more things.
- use new immediate mode
- use new matrix stack
- remove state push/pop
Part of T49043 and T49450 
						
						
					 
					
						2017-01-19 00:46:20 -05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						e138cdeeb6 
					 
					
						
						
							
							Transform manipulator: Allow first clicking Shift before selecting axis  
						
						 
						
						... 
						
						
						
						Avoids possible jumps when one is trying to do some really preciese tweak.
Quite striaghtforward change for mouse input initialization: take Shift
state into account. However, this will interfere with the axis exclusion
which is currently also uses Shift (the feature to move something in a
plane which doesn't have selected axis). This is probably not so commonly
used feature (nobody in the studio even knew of it) and the only downside
now would be that such a constrainted movement will become accurate by
default. That's easy to deal from user side by just unholding Shift key.
Reviewers: brecht, mont29, Severin
Differential Revision: https://developer.blender.org/D2418  
						
						
					 
					
						2017-01-18 12:18:54 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						6ecab6dd8e 
					 
					
						
						
							
							Revert particle system and point cache removal in blender2.8 branch.  
						
						 
						
						... 
						
						
						
						This reverts commit 5aa19be912  and b4a721af69 .
Due to postponement of particle system rewrite it was decided to put particle code
back into the 2.8 branch for the time being. 
						
						
					 
					
						2016-12-28 17:30:58 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						9be6d5ff18 
					 
					
						
						
							
							Merge branch 'master' into blender2.8  
						
						 
						
						... 
						
						
						
						Conflicts:
	source/blender/blenkernel/intern/depsgraph.c
	source/blender/blenloader/intern/versioning_270.c
	source/blender/depsgraph/intern/builder/deg_builder_relations.cc
	source/blender/makesrna/intern/rna_main_api.c
	source/blender/makesrna/intern/rna_particle.c 
						
						
					 
					
						2016-12-12 16:17:57 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Julian Eisel 
							
						 
					 
					
						
						
							
						
						0a26904a75 
					 
					
						
						
							
							Fix T49872: 3D cursor places with camera shift in ortographic mode  
						
						 
						
						
						
						
					 
					
						2016-12-08 12:41:27 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						d258865995 
					 
					
						
						
							
							Compiler warning fix  
						
						 
						
						
						
						
					 
					
						2016-12-02 03:13:46 +13:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Dalai Felinto 
							
						 
					 
					
						
						
							
						
						2bcb1b208a 
					 
					
						
						
							
							Merge remote-tracking branch 'origin/master' into blender2.8  
						
						 
						
						
						
						
					 
					
						2016-11-16 17:04:21 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Julian Eisel 
							
						 
					 
					
						
						
							
						
						0cd1b5ef85 
					 
					
						
						
							
							Fix T50022: "Mirror" in Dopesheet Crashes Blender  
						
						 
						
						... 
						
						
						
						Just fixing crash itself. Actually operator shouldn't run in most editors (not in dopesheet either I guess), but don't want to spend time on that right now. 
						
						
					 
					
						2016-11-15 15:30:33 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						9843921288 
					 
					
						
						
							
							Merge branch 'master' into blender2.8  
						
						 
						
						... 
						
						
						
						Conflicts:
	release/scripts/startup/bl_ui/properties_particle.py
	release/scripts/startup/bl_ui/properties_physics_cloth.py
	release/scripts/startup/bl_ui/properties_physics_dynamicpaint.py
	release/scripts/startup/bl_ui/properties_physics_softbody.py
	source/blender/blenkernel/BKE_library.h
	source/blender/blenkernel/BKE_particle.h
	source/blender/blenkernel/intern/cloth.c
	source/blender/blenkernel/intern/library.c
	source/blender/blenkernel/intern/library_query.c
	source/blender/blenkernel/intern/particle_system.c
	source/blender/blenkernel/intern/scene.c
	source/blender/blenkernel/intern/softbody.c
	source/blender/blenloader/intern/readfile.c
	source/blender/blenloader/intern/versioning_270.c
	source/blender/editors/space_file/filesel.c
	source/blender/editors/space_outliner/outliner_intern.h
	source/blender/makesdna/DNA_ID.h
	source/blender/makesdna/DNA_object_force.h
	source/blender/makesdna/DNA_particle_types.h
	source/blender/makesrna/intern/rna_particle.c
	source/blender/makesrna/intern/rna_sculpt_paint.c
	source/blender/makesrna/intern/rna_smoke.c
	source/blender/makesrna/intern/rna_space.c 
						
						
					 
					
						2016-08-06 12:45:03 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						fb94f4b884 
					 
					
						
						
							
							Fix T48998: 'header input' of rotation transform was clamped in [-PI, PI[ range.  
						
						 
						
						... 
						
						
						
						Can't see any reason for this behavior (inherited from 2.4x code), so for now just removing it. 
						
						
					 
					
						2016-08-02 12:43:03 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						8fab198aae 
					 
					
						
						
							
							Cleanup: rename btree (incorrect & confusing)  
						
						 
						
						
						
						
					 
					
						2016-07-31 12:05:53 +10:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						f74645578c 
					 
					
						
						
							
							Missing free for single-sided edge-slide failure  
						
						 
						
						
						
						
					 
					
						2016-07-29 14:24:03 +10:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						cba8e03672 
					 
					
						
						
							
							Fix T48962: Edge-slide, random edge switch order  
						
						 
						
						
						
						
					 
					
						2016-07-28 21:50:41 +10:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						5ecc6a824a 
					 
					
						
						
							
							Fix T48404: Translate fails w/ snap orientation option  
						
						 
						
						... 
						
						
						
						Rotate the object around the snap-target so it meets the snap-point. 
						
						
					 
					
						2016-07-28 18:16:31 +10:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						cfbd605567 
					 
					
						
						
							
							Merge branch 'master' into blender2.8  
						
						 
						
						... 
						
						
						
						Conflicts:
	intern/cycles/blender/addon/ui.py
	source/blender/blenkernel/BKE_particle.h
	source/blender/blenkernel/intern/dynamicpaint.c
	source/blender/blenkernel/intern/library.c
	source/blender/blenkernel/intern/object.c
	source/blender/blenkernel/intern/particle.c
	source/blender/blenkernel/intern/particle_distribute.c
	source/blender/blenkernel/intern/texture.c
	source/blender/editors/object/object_add.c
	source/blender/editors/object/object_relations.c
	source/blender/editors/physics/particle_edit.c
	source/blender/editors/physics/particle_object.c
	source/blender/editors/transform/transform_snap_object.c 
						
						
					 
					
						2016-07-12 00:07:44 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						7a3ea87bbf 
					 
					
						
						
							
							Cleanup: use normalize_v#_length  
						
						 
						
						
						
						
					 
					
						2016-07-08 10:14:49 +10:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						0a026033ae 
					 
					
						
						
							
							BMesh: make toolflags optional  
						
						 
						
						... 
						
						
						
						Saves 8 bytes per vert/edge/face.
Gives overall ~20-25% memory saving for dyntopo sculpting
and modifiers that use BMesh. 
						
						
					 
					
						2016-07-01 19:29:22 +10:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						cbce7fef16 
					 
					
						
						
							
							Merge branch 'master' into blender2.8  
						
						 
						
						... 
						
						
						
						Conflicts:
	source/blender/blenkernel/intern/pointcache.c
	source/blender/makesrna/intern/rna_main_api.c
	source/blender/makesrna/intern/rna_particle.c 
						
						
					 
					
						2016-06-27 15:59:01 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						37560e77e8 
					 
					
						
						
							
							Fix T48689: Transform proportional size was not seriously clamped.  
						
						 
						
						... 
						
						
						
						Now use same, reasonable min/max values, to avoid getting inf or zero values when
using shortcuts during transform operation... 
						
						
					 
					
						2016-06-23 16:45:06 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						eedcc4a6a0 
					 
					
						
						
							
							Merge branch 'master' into blender2.8  
						
						 
						
						
						
						
					 
					
						2016-06-15 17:29:11 +10:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Phil Gosch 
							
						 
					 
					
						
						
							
						
						9c600435fa 
					 
					
						
						
							
							Made incremental snapping intervalls smaller for UV editor  
						
						 
						
						... 
						
						
						
						Before the intervall was set to 0.125 which effectively resulted in 8 positions across the UV space (per axis).
I halved that value, holding shift enables an even finer movement.
This change was ported over from my soc-2016-uv_tools branch after talking with howardt, ideasman42 and hackerman- 
						
						
					 
					
						2016-06-13 18:35:32 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						11af9e9a5b 
					 
					
						
						
							
							Merge branch 'master' into blender2.8  
						
						 
						
						... 
						
						
						
						Conflicts:
	intern/cycles/blender/blender_curves.cpp
	intern/cycles/blender/blender_particles.cpp
	source/blender/depsgraph/intern/builder/deg_builder_relations.h
	source/blender/depsgraph/intern/depsgraph_build.cc 
						
						
					 
					
						2016-06-01 14:34:11 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						a0e91ef040 
					 
					
						
						
							
							Fix T48554: Absolute grid snap fails w/ cursor pivot  
						
						 
						
						... 
						
						
						
						Use center of selection when using absolute grid snapping and cursor pivot. 
						
						
					 
					
						2016-06-01 00:01:17 +10:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						faec430914 
					 
					
						
						
							
							Merge branch 'master' into blender2.8  
						
						 
						
						... 
						
						
						
						Conflicts:
	intern/cycles/blender/blender_curves.cpp
	source/blender/blenkernel/intern/dynamicpaint.c
	source/blender/blenkernel/intern/particle.c
	source/blender/blenloader/intern/versioning_270.c
	source/blender/editors/physics/particle_edit.c
	source/blender/editors/transform/transform_snap_object.c
	source/blender/editors/util/undo.c
	source/blender/makesrna/intern/rna_object_force.c 
						
						
					 
					
						2016-05-24 16:48:10 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						b1e2f8be23 
					 
					
						
						
							
							Fix T48426: Use same length for all header message strings.  
						
						 
						
						... 
						
						
						
						Some languages like Chinese or Japanese take three or four bytes per char...
Also fixed some missing translation markers for UI header messages. 
						
						
					 
					
						2016-05-14 10:00:52 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						29a792a75b 
					 
					
						
						
							
							Removed all direct uses of BKE_particle.h and DNA_particle_types.h from source/blender/editors.  
						
						 
						
						
						
						
					 
					
						2016-04-12 13:04:31 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						73b672ee97 
					 
					
						
						
							
							Fix: Transform constraint/helper line drawing had incorrect thickness when GPencil strokes are shown  
						
						 
						
						
						
						
					 
					
						2016-02-09 21:55:07 +13:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						c2508b0aaf 
					 
					
						
						
							
							Fix transform crash in rare cases  
						
						 
						
						... 
						
						
						
						In some cases transform modes would use the custom-data pointer,
other times the transform conversion functions would.
However with some combinations (bone mirror + bend for eg),
both conversion & transform mode would use this pointer causing a crash.
Fix this by having 2 custom-data pointers:
one for the mode, another for the data-type.
This also simplifies time-slide which was conditionally mixing mode/type data in the one array. 
						
						
					 
					
						2016-02-01 15:23:29 +11:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						75838de7c3 
					 
					
						
						
							
							Fix i18n-related points in T47265 - mostly, fix non-translated items in enum-search popup menu.  
						
						 
						
						
						
						
					 
					
						2016-01-29 15:06:46 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						e25ba162c0 
					 
					
						
						
							
							OpenGL: call glLineWidth less often  
						
						 
						
						... 
						
						
						
						Each LINES draw call is now responsible for its own line width. No need
to set it back to its 1.0 default after every draw.
This eliminates half our calls to glLineWidth , similar to last week’s
work on glPointSize. 
						
						
					 
					
						2016-01-23 00:58:51 -05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						1d88773b1f 
					 
					
						
						
							
							OpenGL: cleanup  
						
						 
						
						... 
						
						
						
						- LINE_STRIP to LINES when only drawing one
- group state changes for easier reading
- general cleanup 
						
						
					 
					
						2016-01-22 02:52:12 -05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						e20b30a1d8 
					 
					
						
						
							
							OpenGL: remove glPointSize hack  
						
						 
						
						
						
						
					 
					
						2016-01-07 16:32:35 -05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						73a5e4afa9 
					 
					
						
						
							
							Fix T46946: EdgeSlide via G-G disables 'Correct UV'  
						
						 
						
						
						
						
					 
					
						2015-12-18 18:25:37 +11:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						9e56c570c3 
					 
					
						
						
							
							Cleanup: use more logical names for View3D.around  
						
						 
						
						... 
						
						
						
						D1651 (own patch) 
						
						
					 
					
						2015-12-01 18:53:26 +11:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						4ebede5d1f 
					 
					
						
						
							
							fix error in last commit  
						
						 
						
						
						
						
					 
					
						2015-11-24 17:57:47 +11:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						6ba9d1094a 
					 
					
						
						
							
							Fix T46805: Scale along axis fails w/ Python  
						
						 
						
						... 
						
						
						
						't->value' no longer has constraint matrix applied for translate,
fix for T46003 is no longer needed. 
						
						
					 
					
						2015-11-24 16:50:21 +11:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						48b1656a6c 
					 
					
						
						
							
							Cleanup: shadowing (editors)  
						
						 
						
						
						
						
					 
					
						2015-11-23 17:40:50 +11:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						9cff20e5c6 
					 
					
						
						
							
							Correct assert in own last commit  
						
						 
						
						
						
						
					 
					
						2015-11-12 05:51:39 +11:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						137ca0b241 
					 
					
						
						
							
							Fix T46741: Transform ignores constraint space  
						
						 
						
						... 
						
						
						
						Calling transform operator from Python didn't apply the constraints space. 
						
						
					 
					
						2015-11-12 02:21:56 +11:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						78836c0211 
					 
					
						
						
							
							Fix T46743: Crash w/ limit rotation constraint  
						
						 
						
						... 
						
						
						
						Using axis-angle + limit rotations 'Transform' option was crashing. 
						
						
					 
					
						2015-11-11 04:46:55 +11:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						dcc41c4f78 
					 
					
						
						
							
							Cleanup: spelling, headers  
						
						 
						
						
						
						
					 
					
						2015-11-07 17:31:28 +11:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						7a09d15ade 
					 
					
						
						
							
							Cleanup: comments/style  
						
						 
						
						
						
						
					 
					
						2015-11-06 05:34:05 +11:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						bed91b623f 
					 
					
						
						
							
							Edge/Vert slide: improve multires interpolation  
						
						 
						
						... 
						
						
						
						Need to re-interpolate the entire face, not just the connected loop.
Also add BM_face_interp_multires() 
						
						
					 
					
						2015-11-03 20:38:23 +11:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						0d0fa446b7 
					 
					
						
						
							
							Fix: edge/vert slide ignored multires data  
						
						 
						
						... 
						
						
						
						Multires data fails the CustomData_layer_has_math() check,
so meshes without UV's for eg werent getting interpolated multires. 
						
						
					 
					
						2015-11-03 19:14:19 +11:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Julian Eisel 
							
						 
					 
					
						
						
							
						
						37fbabc64b 
					 
					
						
						
							
							Fix T46647: Crash when using redo panel after extrude individual faces  
						
						 
						
						... 
						
						
						
						Caused by rBe0c60985b6. 
						
						
					 
					
						2015-10-30 21:54:47 +01:00