projects
/
blender-staging.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
d024452
1aebee2
)
Orange: tuesday sync with bf-blender
author
Ton Roosendaal <ton@blender.org>
Tue, 6 Dec 2005 10:58:54 +0000
(10:58 +0000)
committer
Ton Roosendaal <ton@blender.org>
Tue, 6 Dec 2005 10:58:54 +0000
(10:58 +0000)
1
2
source/blender/blenkernel/intern/effect.c
patch
|
diff1
|
diff2
|
blob
|
history
source/blender/renderconverter/intern/convertBlenderScene.c
patch
|
diff1
|
diff2
|
blob
|
history
source/blender/src/space.c
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
source/blender/blenkernel/intern/effect.c
Simple merge
diff --cc
source/blender/renderconverter/intern/convertBlenderScene.c
Simple merge
diff --cc
source/blender/src/space.c
index 32c1feb971879102fb0f9c2ea2e4e05262a61981,5c07f1ba341badd98ae0f5c1391e37a6e39a35fc..9228455371e528eab8c45f60ee582cc7deea48fd
---
1
/
source/blender/src/space.c
---
2
/
source/blender/src/space.c
+++ b/
source/blender/src/space.c
@@@
-89,6
-89,6
+89,7
@@@
#include "BIF_editarmature.h"
#include "BIF_editconstraint.h"
#include "BIF_editfont.h"
++#include "BIF_editgroup.h"
#include "BIF_editkey.h"
#include "BIF_editlattice.h"
#include "BIF_editmesh.h"