141dd5233e
Merged changes in the trunk up to revision 50257.
...
Conflicts resolved:
source/blender/blenkernel/CMakeLists.txt
2012-08-29 00:53:29 +00:00
65d5a818b5
quiet unused function warnings in RNA for functions created by macros.
2012-08-20 07:29:11 +00:00
b7b5029814
Merged changes in the trunk up to revision 48695.
2012-07-06 23:46:48 +00:00
4149ea5f50
Last spell checking (for now).
...
Only mysterious courant from bpy.types.ParticleSettings.courant_target reamins...
2012-07-04 15:52:07 +00:00
558721ab59
More spell checking.
2012-07-04 15:04:38 +00:00
98a7ca61fa
Merged changes in the trunk up to revision 48505.
2012-07-03 00:02:45 +00:00
32478997ec
style cleanup
2012-06-27 18:29:47 +00:00
329b05dcd7
Merged changes in the trunk up to revision 47381.
...
Conflicts resolved:
source/blender/blenloader/intern/readfile.c
2012-06-03 21:11:10 +00:00
ef0c8d532a
Fix #31631 : keyframe insert on uv layer element not working.
2012-05-29 11:19:46 +00:00
0f04f7ce44
Fix #31632 : error inserting keyframing on vertex group element weight.
2012-05-29 11:00:12 +00:00
a537355426
Typo in property Description
2012-05-29 05:46:54 +00:00
b6a9a953bc
Merged changes in the trunk up to revision 47056.
...
Conflicts resolved:
source/blender/bmesh/bmesh_class.h
source/blender/bmesh/intern/bmesh_construct.c
source/blender/editors/interface/resources.c
source/blender/render/intern/source/convertblender.c
2012-05-26 22:22:45 +00:00
396a3d31cc
Add MVertSkin DNA/RNA and customdata (CD_MVERT_SKIN).
...
The MVertSkin currently just stores local skin radii and skin
flags (MVertSkinFlag).
Skin modifier documentation:
http://wiki.blender.org/index.php/User:Nicholasbishop/SkinModifier
Reviewed by Campbell Barton.
2012-05-22 15:18:43 +00:00
a5152b7ca0
Merged changes in the trunk up to revision 46787.
...
Conflicts resolved:
source/blender/blenkernel/intern/idcode.c
source/blender/blenloader/intern/readfile.c
source/blender/editors/include/ED_anim_api.h
source/blender/editors/include/UI_resources.h
source/blender/makesrna/intern/rna_main.c
2012-05-19 08:40:56 +00:00
d2895f0a59
Fix #31395 : setting mesh.uv_textures['uvmap'].active did not update correctly.
2012-05-18 15:06:26 +00:00
a9f6e54384
style cleanup: mostly whitespace in rna
2012-05-12 11:01:29 +00:00
8925ed1420
Merged changes in the trunk up to revision 46557.
...
Conflicts resolved:
source/blender/blenkernel/intern/material.c
source/blender/blenkernel/intern/subsurf_ccg.c
source/blender/blenloader/intern/readfile.c
source/blender/editors/animation/anim_channels_defines.c
source/blender/makesrna/intern/rna_scene.c
Additional changes:
* Fix for recent changes of BKE_* function renaming.
* Fix for an "attempt to free NULL pointer" in BlenderStrokeRenderer::RenderStrokeRepBasic().
2012-05-11 22:48:41 +00:00
c8cbe63947
Cycles: fix issues with texture coordinates and object scale. Auto texture
...
space size and location were outdated often, and already computed on demand
by blender internal, now do that through RNA as well.
2012-05-08 23:39:31 +00:00
c91cee2bb9
code cleanup: naming - BKE_mesh_*
2012-05-05 21:28:12 +00:00
2585d52405
Merged changes in the trunk up to revision 46045.
...
Conflicts resolved:
doc/python_api/sphinx_doc_gen.py
source/blender/blenkernel/intern/subsurf_ccg.c
source/blender/editors/mesh/editmesh_tools.c
source/blender/makesdna/DNA_scene_types.h
2012-04-29 00:59:04 +00:00
f665c3cb00
py/rna api: remove selection and pin variable for texture faces - this is now stored in the loops.
2012-04-23 11:36:40 +00:00
1642e2888c
rename Mesh.uv_loop_layers --> uv_layers
...
add filtering for document generator to support --partial bpy.types.SomeType
2012-04-22 23:51:50 +00:00
5c89138684
style cleanup: comments
2012-04-22 11:54:53 +00:00
4a63eb9321
Added operators for adding the data paths to Freestyle edge/face mark properties of
...
selected edges/polygons into the active keying set. This makes it easy to keyframe
a number of Freestyle edge/face marks.
2012-04-22 00:59:27 +00:00
8765dfccf7
style cleanup: correct typos
2012-04-21 14:14:58 +00:00
79e2cd8fdf
Merged changes in the trunk up to revision 45383.
2012-04-04 00:50:41 +00:00
03479c04ed
fix [ #30608 ] Regression: BMesh merge broke customdata int/float/string layers
2012-04-03 11:19:58 +00:00
64d2a32f92
rna/py api - rename layers with polygon prefix, since there are edge and vertex layers too.
2012-04-03 11:10:26 +00:00
4c36a26af5
Merged changes in the trunk up to revision 45308.
...
Conflicts resolved:
source/blender/editors/interface/resources.c
source/blender/editors/mesh/editmesh_select.c
source/blender/editors/space_view3d/drawobject.c
2012-03-31 22:09:43 +00:00
f469e0652a
Node socket values now only have soft limits, rather than hard limits, so you
...
can type in any value, and only when sliding the number value there is a limit.
It was already possible to assign any value to a socket with node linking, so
this shouldn't cause any new issues.
Also raised the limits on the math nodes, with a patch by Agustin Benavidez.
2012-03-30 16:09:05 +00:00
c9c66720c8
disallow adding tessfaces to a mesh with polygons (only allowed case is creating a new mesh with tessfaces and later converting to polygons, which wont work if polygons exist)
2012-03-26 04:32:04 +00:00
452f7c3868
setting the active texture layer from python would get the UV layer out of sync. (entering editmode would show the wrong UV layer)
2012-03-26 04:23:18 +00:00
3b711a6ed0
Merged changes in the trunk up to revision 45133.
...
Conflicts resolved:
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/writefile.c
source/blender/bmesh/intern/bmesh_construct.c
source/blender/bmesh/intern/bmesh_mesh_conv.c
source/blender/bmesh/intern/bmesh_mesh_conv.h
source/blender/editors/interface/interface_templates.c
source/blender/editors/interface/resources.c
source/blender/editors/mesh/bmesh_select.c
source/blender/editors/mesh/bmesh_tools.c
source/blender/editors/space_view3d/drawobject.c
source/blender/render/intern/source/shadeoutput.c
2012-03-25 08:20:19 +00:00
174a46361f
doc cleanup: minor corrections and improvements to docstrings + recent doc changes.
2012-03-23 01:55:38 +00:00
8e2efc1dbf
rna/python api change: rename Mesh.faces --> tessfaces, since existing scripts are using this to modify the mesh and its confusing that the edits are not kept.
...
This also makes it clearer that the faces are for tessellated results only.
Added a section on the Gotcha's about upgrading scripts, the pros and cons of MeshTessFace/MeshPoly/BMFace.
and spesifically how to upgrade importers and exporters for 2.63+.
2012-03-23 00:28:29 +00:00
ed43b652ee
Code style edits (mostly spliting long lines, and removing trailing spaces).
...
Note about long lines: I did not touch to two pieces of code (because I don’t see any way to keep a nicely formated, compact code, with shorter lines):
* The node types definitions into rna_nodetree_types.h
* The vgroup name functions into rna_particle.c
2012-03-18 09:27:36 +00:00
4f19c1a995
spelling cleanup
2012-03-18 07:38:51 +00:00
91580c0929
swap BMLoopCol r/b color, requires subversion bump.
...
old mesh MCol 'r' was blue, 'b' was red, but theres no reason to keep this for bmesh with MLoopCol.
Loading old files works, saving legacy format works too.
What wont work is loading a file after this revision and loading it in an older revision since the bmesh merge.
(it wont crash but the blue and red will be swapped on vertex color layers).
2012-03-17 20:39:28 +00:00
1f6ae5e4fb
Minor UI messages fixes, and enabling i18n for all modifier_setError() error messages.
2012-03-17 14:27:46 +00:00
b40386a3e3
fixes for vertex color (found when brining X3D import back)
...
- tessface vertex color had the wrong sized array passing to rna_iterator_array_begin
- re-calculating tessface's would clear them if they were already created (own mistake)
- ED_mesh_color_add initialized tessface vertex colors from the loop color array
also made rna's mesh.tessface_vertex_colors.new() work like tessface_uv_textures.new()
where layers can be added as long as polygons are not present.
2012-03-15 05:40:33 +00:00
a2ebfc82db
Merged changes in the trunk up to revision 44797.
...
Conflicts resolved:
doc/python_api/sphinx_doc_gen.py
source/blender/makesdna/DNA_mesh_types.h
source/blender/makesrna/intern/rna_action.c
source/blender/makesrna/intern/rna_ID.c
source/blender/makesrna/intern/rna_mesh.c
2012-03-10 21:56:23 +00:00
6bed106ed4
the length of mesh.tessface_vertex_colors was reported incorrect. (fix needed for FBX export)
2012-03-07 22:21:28 +00:00
db4a85162d
edits to rna/tessface UV layer needed to get OBJ import/export functional.
...
add the function to create new UV layers, this only works when there are no polygon layers already created (to prevent confusion since scripts with polygon layers should be adding MTexPoly and MLoopUV layers)
2012-03-07 21:58:58 +00:00
1e41b19ec1
tesselat -> tessellat in UI messages, + style edits.
2012-03-05 16:19:16 +00:00
9e93fc1e8a
Merged changes in the trunk up to revision 44612.
...
Conflicts resolved:
source/blender/blenloader/intern/readfile.c
source/blender/bmesh/bmesh.h
2012-03-03 01:43:44 +00:00
ea13ec1699
Spelling Cleanup
2012-03-01 12:20:18 +00:00
35708fe150
Merged changes in the trunk up to revision 44561.
...
Conflicts resolved:
source/blender/bmesh/bmesh.h
source/blender/bmesh/bmesh_operators.h
source/blenderplayer/bad_level_call_stubs/stubs.c
2012-02-29 21:35:49 +00:00
49adbe3ab8
Various fixes to UI messages (among other things, all messages needed it should now be capitalized).
2012-02-27 18:14:56 +00:00
9ca7f6659f
Merged changes in the trunk up to revision 44419.
...
Conflicts resolved:
doc/python_api/sphinx_doc_gen.py
source/blender/blenloader/intern/readfile.c
source/blender/editors/space_view3d/drawobject.c
source/creator/CMakeLists.txt
2012-02-25 01:26:45 +00:00
cf092e5a2f
Python: add MeshLoop.index, same as already existed for vert/edge/face/poly.
2012-02-24 15:53:26 +00:00
