c3d03b4434
Lamps: Remove HEMI light type
...
This type is not supported by either Eevee or Cycles. If other types of
lamps are needed by external engines, we should support adding custom types.
2018-11-14 11:50:37 +01:00
55e719ec35
Merge branch 'master' into blender2.8
2018-11-14 17:21:34 +11:00
d7f55c4ff5
Cleanup: comment block tabs
2018-11-14 17:10:56 +11:00
c121bc6219
Cleanup: use explicit 'select_and_set_active' API name
...
Selection should be separated from active state and handled by higher
level code (operators/editors) instead of happening automatically.
2018-11-08 08:31:11 +11:00
64ec05b64d
Cleanup: remove some useless BKE_library and BKE_main includes.
...
Makes it simpler to make some changes...
Also fix order of some includes (use alphabetical please).
2018-11-07 20:58:54 +01:00
4b2110fc86
Cleanup: Remove 'BKE_library.h' include from 'BKE_main.h'
...
That kind of implicit includes should really only be done when totally,
absolutely necessary, and ideally only with rather simple 'second-level'
headers.
Otherwise not being explicit with includes always end up biting in
unexpected ways...
2018-11-07 20:58:53 +01:00
66738d4aa0
Merge branch 'master' into blender2.8
2018-10-11 09:08:30 +11:00
2083a7e274
Cleanup: style (pointers)
2018-10-11 09:03:39 +11:00
342e73f90f
Spelling fixes in comments and descriptions (2.8 changes), patch by luzpaz.
...
Differential Revision: https://developer.blender.org/D3719
2018-09-24 18:48:29 +02:00
253dce07d7
Merge branch 'master' into blender2.8
2018-09-24 17:42:52 +02:00
0cff044d84
Spelling fixes in comments and descriptions, patch by luzpaz.
...
Differential Revision: https://developer.blender.org/D3719
2018-09-24 17:28:40 +02:00
a43ebc63fa
Merge branch 'master' into blender2.8
...
Conflicts:
source/blender/blenkernel/intern/collision.c
2018-09-03 17:44:36 +02:00
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
0ddf3e110e
Cleanup: comment blocks
2018-09-02 18:51:31 +10:00
ae57383648
Cleanup: comment blocks
2018-09-02 18:28:27 +10:00
89186595de
Cleanup: add file doxy comments
2018-08-30 01:56:08 +10:00
42f7767dab
Cleanup: rename files from group to collection to match contents.
2018-08-29 16:25:50 +02:00
66da2f537a
New Grease Pencil object for 2D animation
...
This commit merge the full development done in greasepencil-object branch and include mainly the following features.
- New grease pencil object.
- New drawing engine.
- New grease pencil modes Draw/Sculpt/Edit and Weight Paint.
- New brushes for grease pencil.
- New modifiers for grease pencil.
- New shaders FX.
- New material system (replace old palettes and colors).
- Split of annotations (old grease pencil) and new grease pencil object.
- UI adapted to blender 2.8.
You can get more info here:
https://code.blender.org/2017/12/drawing-2d-animation-in-blender-2-8/
https://code.blender.org/2018/07/grease-pencil-status-update/
This is the result of nearly two years of development and I want thanks firstly the other members of the grease pencil team: Daniel M. Lara, Matias Mendiola and Joshua Leung for their support, ideas and to keep working in the project all the time, without them this project had been impossible.
Also, I want thanks other Blender developers for their help, advices and to be there always to help me, and specially to Clément Foucault, Dalai Felinto, Pablo Vázquez and Campbell Barton.
2018-07-31 10:50:43 +02:00
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
9bd0c63382
Merge branch 'master' into blender2.8
2018-06-29 08:05:38 +02:00
af36dd4664
Cleanup: trailing newlines
2018-06-29 08:02:49 +02:00
a59d7374ea
Nuke DM out of collada code.
...
Also, now use out-of-main temp copy of mesh for export, and fixed a
potential memleak (return without freeing temp copy of mesh, tsst).
2018-06-24 18:40:52 +02:00
31d916210c
Cleanup: remove DM from 'join as shape' operator.
...
Also deduplicated the 'mesh as shapekey' code, we had kind of two funcs
doing the same thing here...
2018-06-21 18:26:12 +02:00
e1dff01e29
Depsgraph: add some missing depsgraph tags when relations change.
2018-06-20 18:12:48 +02:00
56173e512c
Merge branch 'master' into blender2.8
2018-06-17 16:18:15 +02:00
a0a1fc8938
Cleanup: BLI path extension API
...
Use BLI_path_extension_* prefix.
2018-06-17 16:13:24 +02:00
59bb5d3a89
Cleanup: some remaining G.main's in COllada in 2.8...
2018-06-14 16:43:11 +02:00
87b2444270
Merge branch 'master' into blender2.8
...
Conflicts:
source/blender/collada/AnimationExporter.cpp
source/blender/collada/AnimationExporter.h
source/blender/collada/ArmatureImporter.cpp
source/blender/collada/ArmatureImporter.h
source/blender/collada/ControllerExporter.cpp
source/blender/collada/ControllerExporter.h
source/blender/collada/DocumentExporter.cpp
source/blender/collada/DocumentImporter.cpp
source/blender/collada/GeometryExporter.cpp
source/blender/collada/GeometryExporter.h
source/blender/collada/MeshImporter.cpp
source/blender/collada/MeshImporter.h
source/blender/collada/SkinInfo.cpp
source/blender/collada/SkinInfo.h
source/blender/collada/collada_utils.cpp
source/blender/collada/collada_utils.h
2018-06-14 15:55:51 +02:00
fd19069999
Cleanup: remove last G.main's from Collada code.
2018-06-14 15:15:51 +02:00
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
43eebdfebd
Merge branch 'master' into blender2.8
...
Conflicts:
source/blender/collada/DocumentImporter.cpp
source/blender/editors/include/ED_object.h
source/blender/editors/object/object_modifier.c
2018-06-12 12:58:31 +02:00
be57cf9b2a
Cleanup: remove moar G.main from BKE area.
2018-06-12 12:53:27 +02:00
204c167c72
Merge branch 'master' into blender2.8
...
Conflicts:
source/blender/blenkernel/BKE_mesh.h
source/blender/blenkernel/intern/mesh_convert.c
source/blender/editors/interface/interface_eyedropper_color.c
source/blender/editors/object/object_add.c
source/blender/editors/space_image/image_ops.c
source/blender/makesrna/intern/rna_image.c
source/blender/windowmanager/intern/wm_draw.c
2018-06-11 16:02:46 +02:00
78a8d3685b
Cleanup: remove moar ugly G.main usages...
...
BKE_image was an ugly nest, could fix all but the ones from compositor,
so moved ugly G.main there, at least we know where the Evil is that way ;)
2018-06-11 15:40:37 +02:00
908b6960c0
Merge branch 'master' into blender2.8
2018-06-08 08:10:35 +02:00
a25c11fd8d
Cleanup: trailing space
...
Remove from blender/nodes, collada, blenfont & render.
2018-06-08 08:07:48 +02:00
508e34d0bf
Merge branch 'master' into blender2.8
...
Conflicts:
source/blender/editors/animation/anim_deps.c
source/blender/editors/animation/keyframing.c
source/blender/editors/animation/keyingsets.c
source/blender/editors/armature/pose_edit.c
source/blender/editors/armature/pose_transform.c
source/blender/editors/gpencil/gpencil_convert.c
source/blender/editors/include/ED_anim_api.h
source/blender/editors/include/ED_keyframing.h
source/blender/editors/interface/interface_anim.c
source/blender/editors/space_action/action_edit.c
source/blender/editors/space_graph/graph_edit.c
source/blender/editors/space_outliner/outliner_draw.c
source/blender/editors/transform/transform_conversions.c
source/blender/makesrna/intern/rna_armature.c
source/blender/makesrna/intern/rna_pose.c
source/blender/python/intern/bpy_rna_anim.c
source/blenderplayer/bad_level_call_stubs/stubs.c
source/gameengine/Converter/KX_BlenderSceneConverter.cpp
2018-06-07 13:04:16 +02:00
b3a7a75a26
Cleanup: remove moar G.main usages.
...
Notes:
* Really need to address RNA setters case, end up adding way too much
G.main here these days... :/
* Added Main pointer into bAnimContext, helps a lot in anim code ;)
2018-06-07 12:48:29 +02:00
df0253be33
Merge branch 'master' into blender2.8
...
Conflicts:
source/blender/collada/ArmatureExporter.cpp
source/blender/collada/ArmatureExporter.h
source/blender/collada/DocumentExporter.cpp
source/blender/collada/DocumentExporter.h
source/blender/collada/SceneExporter.cpp
source/blender/collada/SceneExporter.h
source/blender/collada/collada.cpp
source/blender/collada/collada.h
source/blender/editors/armature/armature_edit.c
source/blender/editors/armature/pose_transform.c
source/blender/editors/include/ED_armature.h
source/blender/editors/include/ED_object.h
source/blender/editors/include/ED_screen.h
source/blender/editors/io/io_collada.c
source/blender/editors/object/object_transform.c
source/blender/editors/screen/screen_edit.c
source/blender/editors/screen/screen_ops.c
source/blender/windowmanager/intern/wm.c
source/blender/windowmanager/intern/wm_files.c
source/blender/windowmanager/intern/wm_window.c
source/blenderplayer/bad_level_call_stubs/stubs.c
2018-06-07 11:23:26 +02:00
54f9cd5283
Cleanup: Nuke moar G.main usages...
2018-06-07 11:11:46 +02:00
bb7202495a
Merge branch 'master' into blender2.8
...
Conflicts:
source/blender/collada/ArmatureExporter.cpp
source/blender/collada/ArmatureExporter.h
source/blender/collada/DocumentExporter.cpp
source/blender/collada/DocumentExporter.h
source/blender/collada/SceneExporter.cpp
source/blender/collada/SceneExporter.h
source/blender/collada/collada.cpp
source/blender/collada/collada.h
source/blender/editors/armature/armature_edit.c
source/blender/editors/armature/editarmature_retarget.c
source/blender/editors/armature/pose_transform.c
source/blender/editors/include/ED_armature.h
source/blender/editors/include/ED_object.h
source/blender/editors/include/ED_screen.h
source/blender/editors/io/io_collada.c
source/blender/editors/object/object_transform.c
source/blender/editors/screen/screen_edit.c
source/blender/editors/screen/screen_ops.c
source/blender/windowmanager/intern/wm.c
source/blender/windowmanager/intern/wm_files.c
source/blender/windowmanager/intern/wm_window.c
source/blenderplayer/bad_level_call_stubs/stubs.c
2018-06-06 16:25:28 +02:00
48e871ab1d
Cleanup: Nuke moar G.main usages...
2018-06-06 15:50:24 +02:00
f0d9dbae0d
Merge branch 'master' into blender2.8
...
Conflicts:
source/blender/blenkernel/intern/blendfile.c
source/blender/blenloader/intern/readfile.h
source/blender/blenloader/intern/versioning_250.c
source/blender/blenloader/intern/versioning_260.c
source/blender/blenloader/intern/versioning_270.c
source/blender/blenloader/intern/versioning_legacy.c
source/blender/editors/render/render_shading.c
source/blender/makesrna/intern/rna_movieclip.c
source/blender/render/intern/source/pipeline.c
source/blender/render/intern/source/voxeldata.c
2018-06-05 17:02:50 +02:00
481cdb08ed
Cleanup: use new accessors to blendfile path (Main.name).
2018-06-05 16:33:46 +02:00
bfe1d0e0dc
Merge branch 'master' into blender2.8
2018-06-01 18:26:42 +02:00
75fc1c3507
Cleanup: trailing whitespace (comment blocks)
...
Strip unindented comment blocks - mainly headers to avoid conflicts.
2018-06-01 18:19:39 +02:00
c450966e95
Workbench: Material specific settings for the specular
...
- Uses the roughness setting of the basic eevee material
- renamed gloss_mir to roughness
- set default of roughness to 0.25
- renamed ray_mirror to metallic
- cleaned up material rna (BI mirror struct)
- use BLINN phong model
- normalize incoming/outgoing specular light
- when using camera oriented studiolight, the SolidLight will be used
for specular highlights
- EXPERIMENT: when in world oriented studiolight only the shadow direction will be used.
- change the settings of the internal light to make scenes more
readable
2018-06-01 11:01:55 +02:00
2feed9bdef
Fix Collada building...
2018-05-31 18:37:33 +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
