6292fb4cbd
code cleanup: BKE_libblock_find_name() now takes an ID constant rather then a string.
2012-05-05 17:00:11 +00:00
1dccd4c98a
code cleanup: naming - pose/armature/image
...
also use ..._find_name(..., name) rather then ..._find_named(..., name) --- both were used.
2012-05-05 16:03:57 +00:00
299ff91ea1
code cleanup: BKE_scene api naming.
...
also stop numpy from being found in /usr/include with cmake.
2012-05-05 14:33:36 +00:00
a731e13043
code cleanup: function naming, use BKE_*type* prefix.
2012-05-05 14:03:12 +00:00
bb1f8d9586
Merged changes in the trunk up to revision 46309.
...
Conflicts resolved:
source/blender/blenloader/intern/readfile.c
source/blender/editors/interface/resources.c
source/blender/editors/mesh/editmesh_tools.c
2012-05-05 11:40:42 +00:00
4c5502bfd6
code cleanup: function naming for BLI functions.
2012-05-05 00:23:55 +00:00
b075765edd
Fix #31258 : collada now selects newly added objects after import.
2012-05-03 21:32:49 +00:00
343edf2722
style cleanup: function calls & whitespace.
2012-04-29 17:11:40 +00:00
e701f9b670
style cleanup: whitespace / commas
2012-04-29 15:47:02 +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
4c4389f6a4
code cleanup: remove editbutflag flag from toolsettings & related defines.
2012-04-23 02:48:05 +00:00
cdbfd1db38
Merged changes in the trunk up to revision 45820.
...
Conflicts resolved:
source/creator/creator.c
2012-04-21 00:33:36 +00:00
ac07f89838
Fix #30948 : add scene > copy settings did not copy settings like units, audio, game
...
data, and tool settings.
What exactly should be copied is a bit up to interpretation, but I think these make
sense, and things like audio or game data used to be part of render settings which
do get copied so at least for those it was a regression.
2012-04-15 08:48:11 +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
2f348d8b5d
style cleanup: mainly for mesh code, also some WM function use.
2012-03-24 02:51:46 +00:00
4f19c1a995
spelling cleanup
2012-03-18 07:38:51 +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
4f7bdc59d3
style cleanup: spelling.
...
also remove large, duplicate comments from sunsky.h
2012-03-09 00:41:09 +00:00
95670e03a0
style cleanup / comment formatting for bli/bke/bmesh
2012-03-03 20:19:11 +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
b3a0a33791
"Fix" [ #30431 ] UI string spelling & similar fixes.
...
All suggested changes looked good to me, thx to Michael Färber for this list of changes!
2012-03-02 21:14:37 +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
53fece44cf
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
831f339980
Merged changes in the trunk up to revision 43748.
...
Conflicts resolved:
source/blender/editors/include/UI_resources.h
2012-01-29 12:00:04 +00:00
Dalai Felinto
345703fbef
Cucumber left over: new scene needs a default ESC key
2012-01-25 01:39:38 +00:00
68ae82bb47
Merged changes in the trunk up to revision 43585.
...
Conflicts resolved:
source/blender/editors/include/UI_resources.h
source/blender/editors/interface/resources.c
source/blender/makesrna/intern/rna_scene.c
2012-01-21 23:01:25 +00:00
a8081c1d2b
Uv Tools branch GSOC 2011
...
=========================
Documentation: http://wiki.blender.org/index.php/User:Psy-Fi/UV_Tools
Major features include:
*16 bit image support in viewport
*Subsurf aware unwrapping
*Smart Stitch(snap/rotate islands, preview, middlepoint/endpoint stitching)
*Seams from islands tool (marks seams and sharp, depending on settings)
*Uv Sculpting(Grab/Pinch/Rotate)
All tools are complete apart from stitching that is considered stable but with an extra edge mode under development(will be in soc-2011-onion-uv-tools).
2012-01-17 16:31:13 +00:00
76a211d809
Merged changes in the trunk up to revision 43219.
...
Conflicts resolved:
source/blender/blenkernel/intern/scene.c
source/blender/blenloader/intern/readfile.c
source/blender/render/intern/source/pipeline.c
2012-01-08 11:57:53 +00:00
fd889253e4
Code cleanup
...
Removing some old + unused stuff that's not coming back. For example, the code
for the old "specials menu" used everywhere/all contexts.
2012-01-08 04:14:13 +00:00
3197796cf7
Merged changes in the trunk up to revision 42425.
...
Conflicts resolved:
doc/python_api/sphinx_doc_gen.py
source/blender/blenkernel/intern/DerivedMesh.c
source/blender/blenloader/intern/readfile.c
source/blender/editors/mesh/editmesh.c
source/blender/editors/space_view3d/drawobject.c
2011-12-05 02:12:49 +00:00
cbd5b492b1
remove use of deprecated struct members
...
- editmesh smooth & subdivide were using old mirror axis flag still.
- removed colbits from outliner and object code.
- commented some other parts of the code which access deprecated members and aren't called anywhere.
2011-12-04 06:39:35 +00:00
7baaa08211
Fix #29389 : cycles viewport render not updating on frame changes. This sort of
...
worked by accident before, because of flags that weren't cleared properly. Now
moved the call to update render engines into scene_update_* itself.
2011-11-28 14:55:35 +00:00
b6569ee4e7
Merged changes in the trunk up to revision 42116.
2011-11-26 13:11:55 +00:00
743d2f8c0f
rename image type defines to be less ambiguous, also set BMP as not supporting alpha (it reads but cant write)
2011-11-22 00:35:26 +00:00
30fd1ab523
replace ImBuf.depth with ImBuf.planes to match ImageFormatData.planes & to avoid confusion with ImageFormatData.depth
2011-11-21 20:47:19 +00:00
0e2c8cdcdd
move image settings into their own structure so the interface can be shared where image saving settings are needed.
...
currently file out node and render output share this struct & UI.
2011-11-21 20:19:58 +00:00
2676f2d58f
Merged changes in the trunk up to revision 42021.
...
Conflicts resolved:
source/blender/blenkernel/intern/scene.c
source/blender/blenloader/intern/readfile.c
source/blender/editors/interface/resources.c
source/blender/render/intern/source/pipeline.c
2011-11-20 21:02:12 +00:00
aa19d53de1
edits to 41957, main changes to render layer removal.
...
- report an error if the layer can't be removed
- check the render layer is in the list before removing
2011-11-18 08:42:44 +00:00
9f0a6dca13
Added methods new and remove to scene.render.layers, so now render layers
...
can be created and removed from scripts.
2011-11-18 07:11:54 +00:00
ab3295db33
fix for crash in blenderplayer when the engine isnt fount.
2011-11-15 07:30:26 +00:00
80e398e7b2
Merged changes in the trunk up to revision 41638.
...
Conflicts resolved:
doc/python_api/sphinx_doc_gen.py
source/blender/blenkernel/BKE_main.h
source/blender/blenkernel/intern/library.c
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/writefile.c
source/blender/editors/include/UI_resources.h
source/blender/editors/interface/resources.c
source/blender/makesdna/DNA_ID.h
source/blender/makesdna/intern/makesdna.c
source/blender/makesrna/intern/rna_internal.h
source/blender/makesrna/intern/rna_main.c
source/blender/makesrna/intern/rna_main_api.c
source/blender/makesrna/intern/rna_scene.c
2011-11-08 06:30:02 +00:00
bb8fe0bf4a
minor edits
...
- remove unneeded type check from convert grease pencil operator.
- correct some error prints & use __func__.
- make copy_libblock take an ID* argument rather than void*.
2011-11-07 04:36:37 +00:00
e03fdd8112
Second attempt at getting rid of bsystem_time()
...
Hopefully this fixes Collada. Can't really compile that to check
here...
2011-11-06 12:12:14 +00:00
723484ec06
Removed old "bsystem_time()" function, which by now is just a
...
duplicate of BKE_curframe() which just takes two extra args.
For the few calls in the physics engine where CFRA+1 instead of CFRA
was being used, I've added a new BKE_nextframe() call, which will
calculate for CFRA+1 instead of CFRA in much the same way that
bsystem_time() would end up doing things (which means including
subframe steps).
2011-11-06 06:08:18 +00:00
2a7ade9de2
remove po/ since the workflow for translations uses branches which isnt that useful to have within blenders source dir.
...
For now treat translations as binary files - just access from 'release/datafiles/locale'
2011-11-05 14:26:18 +00:00
d53989bda6
Depsgraph: more tweaking for update acces from python API
...
* Move scene_update_pre callback before depsgraph flusing so it works better
when you do modifications on objects then.
* Fix missing update after making modifications in frame_change_pre, recalc
flags were not being flushed.
2011-11-03 16:41:48 +00:00
fa8fffac1c
Depsgraph/Python: ensure datablocks with animation data get tagged as being
...
updated on frame change.
2011-11-03 10:03:08 +00:00
723e129252
Depsgraph/Python: callbacks and properties to detect datablock changes
...
* Adds two new python handlers: scene_update_pre() and scene_update_post()
These run before and after Blender does a scene update on making modifications
to the scene.
* Datablocks now have an is_updated property. This will be set to true in the
above callbacks if the datablock was tagged to be updated. This works for the
most common datablocks used for rendering: object, material, world, lamsp,
texture, mesh, curve.
* Datablock collections also have an is_updated property. If this is set, it
means one datablock of this type was added, removed or modified. It's also
useful as a quick check to avoid looping over all datablocks.
* RenderEngine.view_update() can also check these properties, for interactive
viewport rendering.
http://wiki.blender.org/index.php/Dev:2.6/Source/Render/UpdateAPI
2011-11-02 20:56:52 +00:00
ac52c79cb1
RenderEngine/Nodes: system to check for shading nodes compatibility
...
* Scene.use_shading_nodes property to check if RenderEngine is using new shading
nodes system, and RenderEngine.bl_use_shading_nodes to set this.
* Add mechanism for tagging nodes as being compatible with the old/new system.
2011-11-02 19:24:30 +00:00
65668dc5eb
Merged changes in the trunk up to revision 41368.
...
Conflicts resolved:
source/blender/blenkernel/intern/library.c
source/blender/blenlib/intern/bpath.c
source/blender/render/intern/source/convertblender.c
2011-10-30 02:03:40 +00:00
