Bastien Montagne
|
a43ebc63fa
|
Merge branch 'master' into blender2.8
Conflicts:
source/blender/blenkernel/intern/collision.c
|
2018-09-03 17:44:36 +02:00 |
|
Brecht Van Lommel
|
4da2acae3a
|
Spelling fixes in comments and descriptions, patch by luzpaz.
Differential Revision: https://developer.blender.org/D3668
|
2018-09-03 16:55:01 +02:00 |
|
Brecht Van Lommel
|
74fd17e9d7
|
UI/Python: rename Lamps to Lights, to follow more standard terminology.
Internally it's still mostly named lamps, though some modules like Cycles
were already calling them lights.
|
2018-07-06 20:06:09 +02:00 |
|
Campbell Barton
|
532c8ac583
|
Cleanup: pep8 function indentation
|
2018-06-26 19:58:56 +02:00 |
|
Campbell Barton
|
98d89cef6b
|
Fix background_job template
Update attribute and use empty file operator
|
2018-01-10 17:50:41 +11:00 |
|
Campbell Barton
|
c4188c2bba
|
Correct error in background job template
Remove check for the path being writable,
the operator raises error in this case.
|
2015-11-20 16:09:02 +11:00 |
|
Campbell Barton
|
33955940e4
|
add templates menu for OSL, use preprocessor directive color for decorators in python.
|
2012-12-30 01:39:55 +00:00 |
|