32c7e22d36
Merged changes in the trunk up to revision 37388.
...
Conflicts resolved:
release/scripts/startup/bl_ui/properties_render.py
source/creator/SConscript
source/blender/blenlib/intern/bpath.c
source/blender/editors/space_outliner/outliner.c
2011-06-11 00:22:10 +00:00
88f4087a57
svn merge -r36725:36801 https://svn.blender.org/svnroot/bf-blender/trunk/blender
2011-05-20 16:52:10 +00:00
54b97c1d9d
Code refactor: split code for render updates and opening render view into
...
separate files, no functional changes.
2011-05-19 11:34:11 +00:00
068c627013
remove unused vars
2011-05-13 13:17:30 +00:00
6ef77cf95a
=bmesh= merge from trunk at r36529
2011-05-08 23:43:18 +00:00
b9d4121283
Merged changes in the trunk up to revision 36408.
2011-05-01 13:50:38 +00:00
c4c22d4e9f
- pass the camera to the render stamp function.
...
- add BKE_write_ibuf_stamp() since saving environment maps & screen shots shouldn't have stamp.
2011-04-30 05:26:09 +00:00
c98148a963
=bmesh= merge from trunk at r36153
2011-04-15 01:19:13 +00:00
3df52d4e19
Merged changes in the trunk up to revision 36092.
...
Conflicts resolved:
source/blender/makesrna/SConscript
source/blender/makesrna/intern/CMakeLists.txt
source/blender/render/intern/source/pipeline.c
2011-04-11 00:09:56 +00:00
1728c20a63
Fixes related to using Library files:
...
- Assigning local materials to library objects disabled
(crashes on undo/redo cases)
- Disabling options in Material buttons to add/remove slots
on library data
- Drawing Object ID template in Object properties, this
allows browse active Object, but especially shows library
status then.
2011-04-08 16:56:44 +00:00
6f5f4283fd
Fix #26781 : Assigning multiple Materials to Text seems not to work correctly
...
Problems was in 0-based numbering vs. 1-based. Fonts are getting converted to
displists when they're displaying and here base conversion happens, so no need
in conversion when assigning material to selected text.
This makes indices more inconsistant, but saves compatibility in both of
directions. Maybe in further releases we'll make indices consistent.
2011-04-04 16:19:18 +00:00
040f0a1096
Merged changes in the trunk up to revision 35828.
...
Conflicts resolved:
source/blender/makesrna/RNA_enum_types.h
According to the changes in revision 35667, the Freestyle-related code
in release/scripts/ui/ was moved to release/scripts/startup/bl_ui/.
2011-03-27 23:11:22 +00:00
e9005b985e
remove some redundant vars, assignments & checks.
2011-03-19 05:06:06 +00:00
33efa9eeb6
Merged changes in the trunk up to revision 35367.
...
To branch builders: From this revision Python 3.2 will be used.
Don't forget svn update in the "lib" directory as well.
2011-03-06 12:13:32 +00:00
Nathan Letwory
95100afc12
doxygen: blender/editors tagged.
2011-02-27 20:29:51 +00:00
f01261d040
merge with/from trunk at r35190
2011-02-27 06:19:40 +00:00
63b31ef91b
Merged changes in the trunk up to revision 35203.
...
Conflicts resolved:
source/creator/creator.c
source/blender/python/intern/bpy.c
2011-02-26 20:21:09 +00:00
Nathan Letwory
5b607701a7
doxygen: prevent GPL license block from being parsed as doxygen comment.
2011-02-23 10:52:22 +00:00
70aa63306a
Merged changes in the trunk up to revision 34996.
...
Conflicts resolved:
C:\bf-blender\soc-2008-mxcurioni\doc\python_api\sphinx_doc_gen.py
C:\bf-blender\soc-2008-mxcurioni\source\blender\makesrna\RNA_types.h
C:\bf-blender\soc-2008-mxcurioni\source\blender\render\SConscript
2011-02-19 23:51:18 +00:00
8b7482892b
made most variables which are only used in a single file and not defined in header static for blenlib, blenkernel and editors.
2011-02-14 17:55:27 +00:00
3789c398ff
Merged changes in the trunk up to revision 34828.
...
Conflicts resolved:
source/blender/makesrna/RNA_enum_types.h
2011-02-13 23:47:30 +00:00
7eb51a012b
Some more fixes for particle textures:
...
* Moving a texture slot didn't keep the moved slot active.
* Copy & paste for particle textures didn't work.
* New textures weren't freed properly.
2011-02-13 12:35:26 +00:00
496a78a593
bugfix [ #25969 ] GLSL missing an update on texture slot change
...
what did I learn from this?
"if at first you don't succeed..
you're not kaito." ;)
2011-02-08 14:33:08 +00:00
c7a122aa27
Merged changes in the trunk up to revision 34335.
2011-01-15 23:09:52 +00:00
8227b3d463
remove/comment unused vars
...
also removed unnecessary NULL checks (where the pointer was used later without checking).
2011-01-13 04:53:55 +00:00
bc1e26e496
Simplified the implementation of toggle buttons for folding/expanding
...
modifier boxes in the Parameter Editor mode UI.
2011-01-09 18:15:00 +00:00
0ec378f3fe
Merged changes in the trunk up to revision 34193.
...
Conflicts resolved:
source/blender/editors/animation/anim_channels_defines.c
source/blender/editors/animation/anim_channels_edit.c
source/blender/editors/animation/keyframes_draw.c
source/blender/editors/animation/keyframes_edit.c
source/blender/editors/include/ED_anim_api.h
source/blender/editors/space_nla/nla_channels.c
source/blender/makesrna/intern/CMakeLists.txt
source/blender/makesrna/intern/rna_main_api.c
source/blender/makesrna/intern/rna_scene.c
API changes resolved:
source/blender/freestyle/intern/system/PythonInterpreter.h
2011-01-09 15:07:14 +00:00
8f21a43535
split BKE_utildefines.h, now it only has blender specific defines like GS() MAKE_ID, FILE_MAXDIR, moved the generic defines to BLI_utildefines.h.
...
no functional changes.
2011-01-07 18:36:47 +00:00
3ead3c4ff3
Merged changes in the trunk up to revision 33894.
...
A note for branch users: CMake 2.8 on 64-bit Windows Vista raised
an error in line 948 of soc-2008-mxcurioni/CMakeLists.txt due to
an invalid argument for the blender_include_dirs macro:
blender_include_dirs(${OPENGL_INCLUDE_DIR})
The command above should be:
blender_include_dirs("${OPENGL_INCLUDE_DIR}")
2010-12-27 01:38:23 +00:00
0db7bdf00a
IRC fix: removing material slot from Object didn't refresh 3D correct.
...
Missing ID tag update.
2010-12-22 17:38:08 +00:00
c4e41d7371
Fix for compilation errors with CMake on Linux. Patch provided by
...
Écrivain through the BA Freestyle thread. Thanks!
2010-12-16 21:11:39 +00:00
8a2eb1f590
* Merged changes in the trunk up to revision 33492.
...
* Fixed a bug in listing all style modules in source/blender/blenlib/intern/bpath.c.
2010-12-06 01:23:18 +00:00
b110c7c8f2
Dependency graph: changed DAG_id_flush_update to DAG_id_tag_update. Now it
...
only tags the ID and does the actual flush/update delayed, before the next
redraw. For objects the update was already delayed, just flushing wasn't
yet.
This should help performance in python and animation editors, by making
calls to RNA property update quicker. Still need to add calls in a few
places where this was previously avoided due to bad performance.
2010-12-05 18:59:23 +00:00
cd97253502
- added GCC warning -Wstrict-prototypes
...
- fixed bug in paste material, exposed by stricter warnings.
- removed/renamed various shadowed vars.
- removed BGE lamp.colour, only allow lamp.color attribute.
2010-12-03 12:30:59 +00:00
43f4dbceb4
Merged changes in the trunk up to revision 32886.
2010-11-05 21:49:36 +00:00
6753882e42
bugfix [ #24009 ] Crash when switching area types and performing ops
2010-11-04 15:59:09 +00:00
894daa01be
Merged changes in the trunk up to revision 32565.
2010-10-18 20:40:43 +00:00
4d37cf90b9
remove G.sce, use G.main->name instead.
...
Both stored the filename of the blend file, but G.sce stored the last opened file.
This will make blender act differently in some cases since a relative path to the last opened file will no longer resolve (which is correct IMHO since that file isnt open and the path might not even be valid anymore).
Tested linking with durian files and rendering to relative paths when no files is loaded however we may need to have some operators give an error if they are used on the default startup.blend.
2010-10-18 06:41:16 +00:00
8268a4be71
most unused arg warnings corrected.
...
- removed deprecated bitmap arg from IMB_allocImBuf (plugins will need updating).
- mostly tagged UNUSED() since some of these functions look like they may need to have the arguments used later.
2010-10-16 14:32:17 +00:00
1807beabf5
- UNUSED macro wasn't throwing an error with GCC if a var become used.
...
- made interface, windowmanager, readfile build without unused warnings.
- re-arranged CMake's source/blender build order so less changed libs are build later, eg: IK, avi
2010-10-16 02:40:31 +00:00
4cfecdd06a
Fix for [ #21822 ] Unusual material slot behaviour, edit v object mode, cascade, SVN 27833
...
* Disabled removing material slots in edit mode and added back error message from 2.49.
2010-10-15 08:11:26 +00:00
f81248265d
tag UNUSED() for operator exec() and invoke() functions.
2010-10-15 01:36:14 +00:00
d7cd6e349d
Merged changes in the trunk up to revision 32390.
2010-10-09 22:30:01 +00:00
629ddacd48
Fix #24135 : Material modification not immediately updated in Outliner
...
Also fixed outliner update when changing active_material_index from Py and
when selecting texture from UI
2010-10-05 11:55:54 +00:00
df528a9209
Merged changes in the trunk up to revision 32124.
2010-09-25 21:03:16 +00:00
Nathan Letwory
af27774158
Fix [ #23539 ] Blender Generated Static Environments Fail To Save
...
reported by bowels
Saving environment map didn't look at relative_path setting, made it do so.
2010-09-23 22:44:03 +00:00
bb7339a7ae
merge with trunk at r31523
2010-09-04 05:31:25 +00:00
dd75ec4907
Merged changes in the trunk up to revision 31190.
2010-08-09 11:32:55 +00:00
8c455e1da8
remove unused includes
2010-08-08 08:33:47 +00:00
a5692fd67b
Merged changes in the trunk up to revision 30952.
2010-08-01 23:37:52 +00:00
