projects
/
blender.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
ca347a1
f828476
)
merged changes to revision 23620
author
Maxime Curioni <maxime.curioni@gmail.com>
Sun, 4 Oct 2009 01:21:33 +0000
(
01:21
+0000)
committer
Maxime Curioni <maxime.curioni@gmail.com>
Sun, 4 Oct 2009 01:21:33 +0000
(
01:21
+0000)
1
2
source/blender/blenkernel/intern/scene.c
patch
|
diff1
|
diff2
|
blob
|
history
source/blender/makesdna/DNA_scene_types.h
patch
|
diff1
|
diff2
|
blob
|
history
source/blender/python/intern/bpy_interface.c
patch
|
diff1
|
diff2
|
blob
|
history
source/blender/render/CMakeLists.txt
patch
|
diff1
|
diff2
|
blob
|
history
source/blender/render/SConscript
patch
|
diff1
|
diff2
|
blob
|
history
source/blender/render/intern/source/pipeline.c
patch
|
diff1
|
diff2
|
blob
|
history
source/blender/windowmanager/intern/wm_files.c
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
source/blender/blenkernel/intern/scene.c
Simple merge
diff --cc
source/blender/makesdna/DNA_scene_types.h
index b192040ad5b7521167ee5505c737f6fd676342e8,c5691b471572323da5e9e67d965e05a288582c85..b3298d30b470ab82f13bed96bb0a4d96d0a84425
---
1
/
source/blender/makesdna/DNA_scene_types.h
---
2
/
source/blender/makesdna/DNA_scene_types.h
+++ b/
source/blender/makesdna/DNA_scene_types.h
@@@
-736,11
-736,9
+741,14
@@@
typedef struct Scene
/* Grease Pencil */
struct bGPdata *gpd;
+
+ /* Physics simulation settings */
+ struct PhysicsSettings physics_settings;
+
+ /* Freestyle */
+ short freestyle_current_layer_number;
+ short pad[3];
+
} Scene;
diff --cc
source/blender/python/intern/bpy_interface.c
Simple merge
diff --cc
source/blender/render/CMakeLists.txt
Simple merge
diff --cc
source/blender/render/SConscript
Simple merge
diff --cc
source/blender/render/intern/source/pipeline.c
Simple merge
diff --cc
source/blender/windowmanager/intern/wm_files.c
Simple merge